Skip to content

Cache assembly loads #107

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
merged 1 commit into from
Aug 18, 2021
Merged

Cache assembly loads #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 34 additions & 18 deletions src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT license.

using System;

using System.Collections.Concurrent;
#if !NETFRAMEWORK
using System.Diagnostics;
#endif
Expand All @@ -30,6 +30,8 @@ public static class MSBuildAssemblyResolver
{
private static readonly string[] AssemblyExtensions = { ".dll", ".exe" };

private static readonly ConcurrentDictionary<string, Lazy<Assembly>> LoadedAssemblies = new ConcurrentDictionary<string, Lazy<Assembly>>(StringComparer.OrdinalIgnoreCase);

#if !NETFRAMEWORK
private static readonly Regex DotNetListSdksRegex = new Regex("^(?<Name>(?<Version>\\d+\\.\\d+\\.\\d{3,4})(?<Tag>[-\\.\\w]*)) \\[(?<Directory>.*)\\]\\r?$", RegexOptions.Multiline);
#endif
Expand Down Expand Up @@ -133,29 +135,43 @@ public static Assembly AssemblyResolve(object sender, ResolveEventArgs args)

foreach (FileInfo candidateAssemblyFile in SearchPaths.SelectMany(searchPath => AssemblyExtensions.Select(extension => new FileInfo(Path.Combine(searchPath, $"{requestedAssemblyName.Name}{extension}")))))
{
if (!candidateAssemblyFile.Exists)
{
continue;
}
Lazy<Assembly> assemblyLazy = LoadedAssemblies.GetOrAdd(
candidateAssemblyFile.FullName,
_ =>
{
return new Lazy<Assembly>(() =>
{
if (!candidateAssemblyFile.Exists)
{
return null;
}

AssemblyName candidateAssemblyName = AssemblyName.GetAssemblyName(candidateAssemblyFile.FullName);
AssemblyName candidateAssemblyName = AssemblyName.GetAssemblyName(candidateAssemblyFile.FullName);

if (requestedAssemblyName.ProcessorArchitecture != ProcessorArchitecture.None && requestedAssemblyName.ProcessorArchitecture != candidateAssemblyName.ProcessorArchitecture)
{
// The requested assembly has a processor architecture and the candidate assembly has a different value
continue;
}
if (requestedAssemblyName.ProcessorArchitecture != ProcessorArchitecture.None && requestedAssemblyName.ProcessorArchitecture != candidateAssemblyName.ProcessorArchitecture)
{
// The requested assembly has a processor architecture and the candidate assembly has a different value
return null;
}

if (requestedAssemblyName.Flags.HasFlag(AssemblyNameFlags.PublicKey) && !requestedAssemblyName.GetPublicKeyToken() !.SequenceEqual(candidateAssemblyName.GetPublicKeyToken() !))
{
// Requested assembly has a public key but it doesn't match the candidate assembly public key
return null;
}

if (requestedAssemblyName.Flags.HasFlag(AssemblyNameFlags.PublicKey) && !requestedAssemblyName.GetPublicKeyToken() !.SequenceEqual(candidateAssemblyName.GetPublicKeyToken() !))
{
// Requested assembly has a public key but it doesn't match the candidate assembly public key
continue;
}
#if NET5_0_OR_GREATER
return LoadContext.LoadFromAssemblyPath(candidateAssemblyFile.FullName);
return LoadContext.LoadFromAssemblyPath(candidateAssemblyFile.FullName);
#else
return Assembly.LoadFrom(candidateAssemblyFile.FullName);
return Assembly.LoadFrom(candidateAssemblyFile.FullName);
#endif
});
});

if (assemblyLazy.Value != null)
{
return assemblyLazy.Value;
}
}

return null;
Expand Down