Use the AppDomainIsolatedTask to isolate the task

Merge pull request #13 from NetOfficeFw/dev/isolated_task

Author: jozefizso

src/AssemblyEx.cs

@@ -17,44 +17,5 @@ public static string GetCodebase(this string path)
             path = path.Replace('\\', '/');
             return $"file:///{path}";
         }
-
-        internal static Assembly ReflectionOnlyLoadAssembly(string path)
-        {
-            if (File.Exists(path))
-            {
-                var assemblyName = AssemblyName.GetAssemblyName(path);
-                var assemblies = AppDomain.CurrentDomain.ReflectionOnlyGetAssemblies();
-                var existing = assemblies.FirstOrDefault(assembly => assembly.FullName == assemblyName.FullName);
-                if (existing != null)
-                {
-                    return existing;
-                }
-
-                var content = File.ReadAllBytes(path);
-                return Assembly.ReflectionOnlyLoad(content);
-            }
-
-            return null;
-        }
-
-        internal static Assembly ReflectionOnlyAssemblyResolve(ResolveEventArgs args, string baseDir)
-        {
-            Console.WriteLine($"Assembly: {args?.Name} by {args?.RequestingAssembly?.GetName()}");
-
-            var name = new AssemblyName(args.Name);
-            var path = Path.Combine(baseDir, name.Name + ".dll");
-            Assembly assembly = null;
-            if (File.Exists(path))
-            {
-                assembly = ReflectionOnlyLoadAssembly(path);
-            }
-            else
-            {
-                // Log.LogWarning($"Loading assembly by name '{args.Name}'.");
-                assembly = Assembly.ReflectionOnlyLoad(args.Name);
-            }
-
-            return assembly;
-        }
     }
 }

src/CleanAddin.cs

@@ -1,11 +1,12 @@
 using System;
 using System.IO;
+using System.Reflection;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
 namespace NetOfficeFw.Build
 {
-    public class CleanAddin : Task
+    public class CleanAddin : AppDomainIsolatedTask
     {
         [Required]
         public ITaskItem AssemblyPath { get; set; }
@@ -19,9 +20,7 @@ public override bool Execute()
                 var assemblyPath = this.AssemblyPath.ItemSpec;
                 var assemblyDir = Path.GetDirectoryName(assemblyPath);
 
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += (sender, args) => AssemblyEx.ReflectionOnlyAssemblyResolve(args, assemblyDir);
-
-                var assembly = AssemblyEx.ReflectionOnlyLoadAssembly(assemblyPath);
+                var assembly = Assembly.UnsafeLoadFrom(assemblyPath);
                 var publicTypes = assembly.GetExportedTypes();
 
                 foreach (var publicType in publicTypes)

src/RegisterAddin.cs

@@ -5,11 +5,12 @@
 using System.Reflection;
 using System.Security.Policy;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Tasks;
 using Microsoft.Build.Utilities;
 
 namespace NetOfficeFw.Build
 {
-    public class RegisterAddin : Task
+    public class RegisterAddin : AppDomainIsolatedTask
     {
         [Required]
         public ITaskItem AssemblyPath { get; set; }
@@ -24,15 +25,12 @@ public class RegisterAddin : Task
 
         public override bool Execute()
         {
-            AppDomain domain = null;
             try
             {
                 var assemblyPath = this.AssemblyPath.ItemSpec;
                 var assemblyDir = Path.GetDirectoryName(assemblyPath);
 
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += (sender, args) => AssemblyEx.ReflectionOnlyAssemblyResolve(args, assemblyDir);
-
-                var assembly = AssemblyEx.ReflectionOnlyLoadAssembly(assemblyPath);
+                var assembly = Assembly.UnsafeLoadFrom(assemblyPath);
                 var assemblyName = assembly.GetName();
                 var assemblyCodebase = assemblyPath.GetCodebase();
                 var publicTypes = assembly.GetExportedTypes();
@@ -115,13 +113,6 @@ public override bool Execute()
                 Log.LogErrorFromException(ex);
                 return false;
             }
-            finally
-            {
-                if (domain != null)
-                {
-                    AppDomain.Unload(domain);
-                }
-            }
 
             return true;
         }