Add support to process assemblies with generics <T>

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/nanoframework/CoreLibrary
 [submodule "native/nf-interpreter"]
 	path = native/nf-interpreter
-	url = https://github.com/nanoframework/nf-interpreter
+	url = https://github.com/nanoframework/nf-interpreter.git

.runsettings

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+   <!-- Configurations that affect the Test Framework -->
+   <RunConfiguration>
+       <TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
+       <TargetFrameworkVersion>net472</TargetFrameworkVersion>
+	   <TargetPlatform>x64</TargetPlatform>
+   </RunConfiguration>
+</RunSettings>

MetadataProcessor.Console/Program.cs

@@ -1,18 +1,14 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Original work from Oleg Rakhmatulin.
-// See LICENSE file in the project root for full license information.
-//
+// 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;
-using nanoFramework.Tools.MetadataProcessor.Core;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Reflection;
 using System.Xml;
+using Mono.Cecil;
+using nanoFramework.Tools.MetadataProcessor.Core;
 
 namespace nanoFramework.Tools.MetadataProcessor.Console
 {
@@ -93,10 +89,7 @@ public void Compile(
                         _assemblyBuilder.Write(GetBinaryWriter(writer));
                     }
 
-                    using (var writer = XmlWriter.Create(Path.ChangeExtension(fileName, "pdbx")))
-                    {
-                        _assemblyBuilder.Write(writer);
-                    }
+                    _assemblyBuilder.Write(Path.ChangeExtension(fileName, "pdbx"));
 
                     if (DumpMetadata)
                     {
@@ -188,7 +181,7 @@ public void GenerateDependency(string fileName)
 
         public static void Main(string[] args)
         {
-            FileVersionInfo fileVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
+            FileVersionInfo fileVersion = FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
 
             bool isCoreLibrary = false;
 

MetadataProcessor.Console/Properties/AssemblyInfo.cs

@@ -1,10 +1,12 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Reflection;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle ("nanoFramework.MetadataProcessor.Console")]
+[assembly: AssemblyTitle("nanoFramework.MetadataProcessor.Console")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("nanoFramework project contributors")]

MetadataProcessor.Core/MetadataProcessor.Core.csproj

@@ -59,6 +59,16 @@
     <None Include="packages.lock.json" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Tasks.Git">
+      <Version>8.0.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.Common">
+      <Version>8.0.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <Version>8.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -75,6 +85,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>8.0.5</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="..\MetadataProcessor.Shared\MetadataProcessor.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

MetadataProcessor.Core/Properties/AssemblyInfo.cs

@@ -1,13 +1,16 @@
-using System.Reflection;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
-[assembly: AssemblyTitle ("nanoFramework.MetadataProcessor.Core")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("nanoFramework project contributors")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Copyright (c) 2019 The nanoFramework project contributors")]
+[assembly: AssemblyTitle("nanoFramework.MetadataProcessor.Core")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("nanoFramework project contributors")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Copyright (c) 2019 The nanoFramework project contributors")]
 
-[assembly: InternalsVisibleTo("nanoFramework.Tools.MetadataProcessor.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035b49090a010c2970b2f8df8f66ad47a09583d654c0f2375980cf4afcfb48141ec9fd27d464b93a3216545588a5119d779c0ec66eed7c715567c2315cb908f70403b3bb59018b34096ad29c1c91f8d3c83ad407052ead9112e694660dec0ce7a361bff67781cf041e19d78afd128603dd188eb238186ac5aa6caf418891d5bb2")]
+[assembly: InternalsVisibleTo("nanoFramework.Tools.MetadataProcessor.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]

MetadataProcessor.Core/packages.lock.json

@@ -2,6 +2,18 @@
   "version": 1,
   "dependencies": {
     ".NETFramework,Version=v4.7.2": {
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -30,15 +42,76 @@
         "resolved": "3.7.115",
         "contentHash": "EpXamaAdRfG/BMxGgvZlTM0npRnkmXUjAj8OdNKd17t4oN+2nvjdv/KnFmzOOMDqvlwB49UCwtOHJrAQTfUBtQ=="
       },
-      "Microsoft.Build.Tasks.Git": {
+      "System.Text.Json": {
+        "type": "Direct",
+        "requested": "[8.0.5, )",
+        "resolved": "8.0.5",
+        "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.5",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
+          "System.Text.Encodings.Web": "8.0.0",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
+      },
+      "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
         "resolved": "8.0.0",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+        "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
       },
-      "Microsoft.SourceLink.Common": {
+      "System.Buffers": {
+        "type": "Transitive",
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
+      },
+      "System.Memory": {
+        "type": "Transitive",
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+        }
+      },
+      "System.Numerics.Vectors": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
+      },
+      "System.Runtime.CompilerServices.Unsafe": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+      },
+      "System.Text.Encodings.Web": {
         "type": "Transitive",
         "resolved": "8.0.0",
-        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.5",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+        }
+      },
+      "System.Threading.Tasks.Extensions": {
+        "type": "Transitive",
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+        }
+      },
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
       }
     },
     ".NETFramework,Version=v4.7.2/win": {},

MetadataProcessor.MsBuildTask/MetaDataProcessorTask.cs

@@ -1,20 +1,17 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.ComponentModel;
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Collections.Generic;
-using nanoFramework.Tools.Utilities;
 using System.Xml;
-using nanoFramework.Tools.MetadataProcessor.Core;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 using Mono.Cecil;
+using nanoFramework.Tools.MetadataProcessor.Core;
+using nanoFramework.Tools.Utilities;
 
 namespace nanoFramework.Tools.MetadataProcessor.MsBuildTask
 {
@@ -126,7 +123,7 @@ public override bool Execute()
             // developer note: to debug this task set an environment variable like this:
             // set NFBUILD_TASKS_DEBUG=1
             // this will cause the execution to pause bellow so a debugger can be attached
-            DebuggerHelper.WaitForDebuggerIfEnabled(TasksConstants.BuildTaskDebugVar);
+            DebuggerHelper.WaitForDebuggerIfEnabled(TasksConstants.BuildTaskDebugVar, Log);
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
             try
@@ -298,6 +295,26 @@ private void ExecuteParse(
         private void ExecuteCompile(
             string fileName)
         {
+            FileStream logOutputStream = null;
+            StreamWriter logWriter = null;
+            string logFile = "";
+
+            try
+            {
+                if (Verbose)
+                {
+                    logFile = Path.ChangeExtension(fileName, "log.txt");
+
+                    logOutputStream = new FileStream(logFile, FileMode.OpenOrCreate, FileAccess.Write);
+                    logWriter = new StreamWriter(logOutputStream);
+                    Console.SetOut(logWriter);
+                }
+            }
+            catch
+            {
+                Log.LogError($"Unable to create log file '{logFile}'.");
+            }
+
             try
             {
                 // compile assembly (1st pass)
@@ -319,6 +336,12 @@ private void ExecuteCompile(
             {
                 Log.LogError($"Unable to compile output assembly file '{fileName}' - check parse command results");
 
+                if (Verbose)
+                {
+                    logWriter?.Close();
+                    logOutputStream?.Close();
+                }
+
                 throw;
             }
 
@@ -342,10 +365,7 @@ private void ExecuteCompile(
                 }
 
                 // output PDBX
-                using (var writer = XmlWriter.Create(Path.ChangeExtension(fileName, "pdbx")))
-                {
-                    _assemblyBuilder.Write(writer);
-                }
+                _assemblyBuilder.Write(Path.ChangeExtension(fileName, "pdbx"));
 
                 // output assembly metadata
                 if (DumpMetadata)
@@ -375,6 +395,14 @@ private void ExecuteCompile(
                 Log.LogError($"Exception minimizing assembly");
                 throw;
             }
+            finally
+            {
+                if (Verbose)
+                {
+                    logWriter?.Close();
+                    logOutputStream?.Close();
+                }
+            }
         }
 
         private void AddClassToExclude(

MetadataProcessor.MsBuildTask/MetadataProcessor.MsBuildTask.csproj

@@ -15,6 +15,8 @@
 		<RepositoryType>git</RepositoryType>
 		<PackageIcon>nf-logo.png</PackageIcon>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -61,7 +63,8 @@
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10.0" PrivateAssets="All" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.6" PrivateAssets="All" />
 		<PackageReference Include="mustache-sharp" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="System.Drawing.Common" Version="6.0.0" PrivateAssets="All" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.12" PrivateAssets="All" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 
   <Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">

MetadataProcessor.MsBuildTask/TasksConstants.cs

@@ -1,13 +1,10 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
 namespace nanoFramework.Tools
 {
     internal class TasksConstants
     {
-        public const string BuildTaskDebugVar = "NFBUILD_TASKS_DEBUG";
+        public const string BuildTaskDebugVar = "NF_MDP_MSBUILD_TASK_DEBUG";
     }
 }