Skip to content
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

Assembly Resolver perf improvement #1218

Merged
merged 8 commits into from
Oct 26, 2017
Merged

Assembly Resolver perf improvement #1218

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3815d3f
Adding null in resolvedAssemblies dictionary for assemblies which cou…
Shyam-Gupta Oct 24, 2017
9607d7a
Merge branch 'master' into assemblyResolverPerfFix
Shyam-Gupta Oct 24, 2017
17fe3ce
Removed extra white spaces
Shyam-Gupta Oct 26, 2017
1e67e5e
Merge branch 'assemblyResolverPerfFix' of https://github.com/Shyam-Gu…
Shyam-Gupta Oct 26, 2017
df4f0b1
Merge branch 'master' into assemblyResolverPerfFix
Shyam-Gupta Oct 26, 2017
9cc5b27
PR comments
Shyam-Gupta Oct 26, 2017
e89e38c
PR comments
Shyam-Gupta Oct 26, 2017
f2c0e33
Merge branch 'assemblyResolverPerfFix' of https://github.com/Shyam-Gu…
Shyam-Gupta Oct 26, 2017
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
5 changes: 3 additions & 2 deletions src/Microsoft.TestPlatform.Common/Utilities/AssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,10 @@ private Assembly OnResolve(object sender, AssemblyResolveEventArgs args)
}
}
}
}

return null;
this.resolvedAssemblies[args.Name] = null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this at line:112, because there is exit path at 126 and we should operate on resolvedAssemblies inside lock (this.resolvedAssemblies) block.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its already under lock block. As per discussion, added this statement in one catch block.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add EqtTrace.IsInfoEnabled check for main flows.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

return null;
}
}

/// <summary>
Expand Down