From 83f89c6ef31b783bd6afa4782df14cbbace0f022 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 26 Apr 2018 23:18:53 -0400
Subject: don't warn when converting net fields to an interface they implement

---
 .../NetFieldAnalyzer.cs                            | 25 +++-------------------
 src/SMAPI.ModBuildConfig/package.nuspec            |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
index e3c92617..0e9154a1 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -19,12 +18,6 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
         /// <summary>The namespace for Stardew Valley's <c>Netcode</c> types.</summary>
         private const string NetcodeNamespace = "Netcode";
 
-        /// <summary>The full name for Stardew Valley's <c>Netcode.NetList</c> type.</summary>
-        private readonly string NetListTypeFullName = "Netcode.NetList";
-
-        /// <summary>The full name for Stardew Valley's <c>Netcode.NetCollection</c> type.</summary>
-        private readonly string NetCollectionTypeFullName = "Netcode.NetCollection";
-
         /// <summary>Maps net fields to their equivalent non-net properties where available.</summary>
         private readonly IDictionary<string, string> NetFieldWrapperProperties = new Dictionary<string, string>
         {
@@ -226,21 +219,9 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
             if (!this.IsNetType(typeInfo.Type) || this.IsNetType(typeInfo.ConvertedType))
                 return false;
 
-            // list conversion to an implemented interface is OK
-            if (AnalyzerUtilities.GetConcreteTypes(typeInfo.Type).Any(p => p.ToString().StartsWith(this.NetListTypeFullName))) // StartsWith to ignore generics
-            {
-                string toType = typeInfo.ConvertedType.ToString();
-                if (toType.StartsWith(typeof(IEnumerable<>).Namespace) || toType == typeof(IEnumerable).FullName)
-                    return false;
-            }
-
-            // collection conversion to an implemented interface is OK
-            if (AnalyzerUtilities.GetConcreteTypes(typeInfo.Type).Any(p => p.ToString().StartsWith(this.NetCollectionTypeFullName))) // StartsWith to ignore generics
-            {
-                string toType = typeInfo.ConvertedType.ToString();
-                if (toType.StartsWith(typeof(IEnumerable<>).Namespace) || toType == typeof(IEnumerable).FullName)
-                    return false;
-            }
+            // conversion to implemented interface is OK
+            if (typeInfo.Type.AllInterfaces.Contains(typeInfo.ConvertedType))
+                return false;
 
             // avoid any other conversions
             return true;
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index 5e0b479e..6bb7736c 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Pathoschild.Stardew.ModBuildConfig</id>
-    <version>2.1.0-beta</version>
+    <version>2.1.0-beta-20180426</version>
     <title>Build package for SMAPI mods</title>
     <authors>Pathoschild</authors>
     <owners>Pathoschild</owners>
-- 
cgit