Skip to content

[Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver to allow forced loading. #270

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
jonpryor merged 2 commits into from
Mar 5, 2018
Merged

[Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver to allow forced loading. #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8be593
[Java.Interop.Tools.Cecil] Change DirectoryAssemblyResolver to allow …
dellis1972 Mar 5, 2018
a9ec2da
ff
dellis1972 Mar 5, 2018
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
8 changes: 4 additions & 4 deletions src/Java.Interop.Tools.Cecil/Java.Interop.Tools.Cecil/DirectoryAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,22 +110,22 @@ public Dictionary<string, AssemblyDefinition> ToResolverCache ()
return new Dictionary<string, AssemblyDefinition>(cache);
}

public virtual AssemblyDefinition Load (string fileName)
public virtual AssemblyDefinition Load (string fileName, bool forceLoad = false)
{
if (!File.Exists (fileName))
return null;

AssemblyDefinition assembly;
AssemblyDefinition assembly = null;
var name = Path.GetFileNameWithoutExtension (fileName);
if (cache.TryGetValue (name, out assembly))
if (!forceLoad && cache.TryGetValue (name, out assembly))
return assembly;

try {
assembly = ReadAssembly (fileName);
} catch (Exception e) {
Diagnostic.Error (9, e, "Error while loading assembly: {0}", fileName);
}
cache.Add (name, assembly);
cache [name] = assembly;
return assembly;
}

Expand Down