Skip to content

Use the AppDomainIsolatedTask to isolate the task #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jozefizso merged 2 commits into from
Dec 7, 2024
Merged

Use the AppDomainIsolatedTask to isolate the task #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
748a629
Use the `AppDomainIsolatedTask` to isolate the task automatically by …
jozefizso Dec 7, 2024
328ab90
Remove unused code
jozefizso Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions src/AssemblyEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
7 changes: 3 additions & 4 deletions src/CleanAddin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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; }
Expand All @@ -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)
Expand Down
15 changes: 3 additions & 12 deletions src/RegisterAddin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand All @@ -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();
Expand Down Expand Up @@ -115,13 +113,6 @@ public override bool Execute()
Log.LogErrorFromException(ex);
return false;
}
finally
{
if (domain != null)
{
AppDomain.Unload(domain);
}
}

return true;
}
Expand Down