Fix processing exclusion attrib with TypeSpecs (#200)

***NO_CI***

Author: josesimoes

MetadataProcessor.Shared/Extensions/TypeReferenceExtensions.cs

@@ -381,5 +381,12 @@ public static string FixedName(this TypeReference value)
         {
             return nanoHelpers.FixTypeNames(value.Name);
         }
+
+        public static bool IsToExclude(this TypeReference value)
+        {
+            return nanoTablesContext.ClassNamesToExclude.Contains(value.FullName) ||
+                   nanoTablesContext.ClassNamesToExclude.Contains(value.Name) ||
+                   nanoTablesContext.ClassNamesToExclude.Contains(value.DeclaringType?.FullName);
+        }
     }
 }

MetadataProcessor.Shared/Extensions/TypeSpecificationExtensions.cs

@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Mono.Cecil;
+
+namespace nanoFramework.Tools.MetadataProcessor.Core.Extensions
+{
+    internal static class TypeSpecificationExtensions
+    {
+        public static bool IsToExclude(this TypeSpecification value)
+        {
+            return nanoTablesContext.ClassNamesToExclude.Contains(value.FullName) ||
+                   nanoTablesContext.ClassNamesToExclude.Contains(value.Name) ||
+                   nanoTablesContext.ClassNamesToExclude.Contains(value.ElementType.FullName) ||
+                   nanoTablesContext.ClassNamesToExclude.Contains(value.DeclaringType?.FullName);
+        }
+    }
+}

MetadataProcessor.Shared/MetadataProcessor.Shared.projitems

@@ -37,6 +37,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\MethodSpecificationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ParameterDefintionExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\TypeDefinitionExtensions.cs" />
+    <Compile Include="..\MetadataProcessor.Shared\Extensions\TypeSpecificationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\TypeReferenceExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)InanoTable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mono.Cecil\CodeWriter.cs" />

MetadataProcessor.Shared/Tables/nanoTypeSpecificationsTable.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using nanoFramework.Tools.MetadataProcessor.Core.Extensions;
 
 namespace nanoFramework.Tools.MetadataProcessor
 {
@@ -223,15 +224,18 @@ private void FillTypeSpecsFromMemberReferences()
                         throw new ArgumentException($".NET nanoFramework doesn't have support for multidimensional arrays. Unable to parse {m.DeclaringType.FullName}.");
                     }
 
-                    typeSpecs.Add(m.DeclaringType as TypeSpecification);
+                    if (!(m.DeclaringType as TypeSpecification).IsToExclude())
+                    {
+                        typeSpecs.Add(m.DeclaringType as TypeSpecification);
 
-                    // get index of signature for the TypeSpecification 
-                    ushort signatureId = _context.SignaturesTable.GetOrCreateSignatureId(m.DeclaringType);
+                        // get index of signature for the TypeSpecification 
+                        ushort signatureId = _context.SignaturesTable.GetOrCreateSignatureId(m.DeclaringType);
 
-                    if (!_idByTypeSpecifications.TryGetValue(m.DeclaringType, out ushort referenceId))
-                    {
-                        // is not on the list yet, add it
-                        _idByTypeSpecifications.Add(m.DeclaringType, signatureId);
+                        if (!_idByTypeSpecifications.TryGetValue(m.DeclaringType, out ushort referenceId))
+                        {
+                            // is not on the list yet, add it
+                            _idByTypeSpecifications.Add(m.DeclaringType, signatureId);
+                        }
                     }
                 }
             }
@@ -240,7 +244,7 @@ private void FillTypeSpecsFromMemberReferences()
             // that may have come in via the TypeReferencesTable.
             foreach (GenericInstanceType genericInstanceType in _context.TypeReferencesTable.Items.OfType<GenericInstanceType>())
             {
-                if (!_idByTypeSpecifications.ContainsKey(genericInstanceType))
+                if (!_idByTypeSpecifications.ContainsKey(genericInstanceType) && !genericInstanceType.IsToExclude())
                 {
                     // create or get the signature ID for this instanced type
                     ushort sigId = _context.SignaturesTable.GetOrCreateSignatureId(genericInstanceType);
@@ -249,7 +253,7 @@ private void FillTypeSpecsFromMemberReferences()
                     // (and don’t forget to pull in any nested generic-parameter args)
                     foreach (GenericParameter arg in genericInstanceType.GenericArguments.OfType<GenericParameter>())
                     {
-                        if (!_idByTypeSpecifications.ContainsKey(arg))
+                        if (!_idByTypeSpecifications.ContainsKey(arg) && !arg.IsToExclude())
                         {
                             ushort argSig = _context.SignaturesTable.GetOrCreateSignatureId(arg);
                             _idByTypeSpecifications.Add(arg, argSig);
@@ -270,7 +274,7 @@ private void FillTypeSpecsFromMemberReferences()
 
             foreach (TypeReference typeRefItem in allGenericInstances)
             {
-                if (!_idByTypeSpecifications.ContainsKey(typeRefItem))
+                if (!_idByTypeSpecifications.ContainsKey(typeRefItem) && !typeRefItem.IsToExclude())
                 {
                     ushort sigId = _context.SignaturesTable.GetOrCreateSignatureId(typeRefItem);
                     _idByTypeSpecifications.Add(typeRefItem, sigId);
@@ -312,7 +316,9 @@ private void FillTypeSpecsFromTypes()
                         else if (instr.Operand is GenericInstanceMethod genericInstanceMethod)
                         {
                             GenericInstanceType genericInstanceType = genericInstanceMethod.DeclaringType as GenericInstanceType;
-                            if (genericInstanceType != null && !_idByTypeSpecifications.ContainsKey(genericInstanceType))
+                            if (genericInstanceType != null
+                                && !_idByTypeSpecifications.ContainsKey(genericInstanceType)
+                                && !genericInstanceType.IsToExclude())
                             {
                                 ushort sigId = _context.SignaturesTable.GetOrCreateSignatureId(genericInstanceType);
                                 _idByTypeSpecifications.Add(genericInstanceType, sigId);
@@ -419,7 +425,8 @@ private void AddIfNew(
             TypeReference tr,
             ushort sigId)
         {
-            if (!_idByTypeSpecifications.ContainsKey(tr))
+            if (!_idByTypeSpecifications.ContainsKey(tr)
+                && !tr.IsToExclude())
             {
                 _idByTypeSpecifications.Add(tr, sigId);
             }