From 2b2860637d36b17d51ce279afaa4d81cefef289d Mon Sep 17 00:00:00 2001
From: Evan Behar <evan.behar@komodohealth.com>
Date: Fri, 6 Jul 2018 23:08:09 -0700
Subject: Linux-compatible scope resolution in validator

---
 .../Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/ModLoading/Finders')

diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
index ecad649a..6364cec8 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
@@ -110,7 +110,15 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="type">The type reference.</param>
         private bool ShouldValidate(TypeReference type)
         {
-            return type != null && this.ValidateReferencesToAssemblies.Contains(type.Scope.Name);
+            // Extract scope name from type string representation for compatibility
+            // Under Linux, type.Scope.Name sometimes reports incorrectly
+            string scopeName = type.ToString();
+            if (scopeName[0] != '$')
+                return false;
+
+            scopeName = scopeName.Substring(0, scopeName.IndexOf(".", System.StringComparison.CurrentCulture));
+
+            return type != null && this.ValidateReferencesToAssemblies.Contains(scopeName);
         }
 
         /// <summary>Get a unique string representation of a type.</summary>
-- 
cgit