Skip to content

Move a couple statics that are highly contended on solution load to just be class members as their container is a singleton. #12679

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
ToddGrun merged 1 commit into from
Jan 14, 2026
Merged

Move a couple statics that are highly contended on solution load to just be class members as their container is a singleton. #12679

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
32 changes: 19 additions & 13 deletions ...Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/RazorAnalyzerAssemblyRedirector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,35 @@ namespace Microsoft.VisualStudio.Razor;
#pragma warning disable RS0030 // Do not use banned APIs
[Shared]
[Export(typeof(IRazorAnalyzerAssemblyRedirector))]
[method: ImportingConstructor]
#pragma warning restore RS0030 // Do not use banned APIs
internal sealed class RazorAnalyzerAssemblyRedirector() : IRazorAnalyzerAssemblyRedirector
internal sealed class RazorAnalyzerAssemblyRedirector : IRazorAnalyzerAssemblyRedirector
{
private static readonly ImmutableArray<(string name, string path)> s_compilerAssemblyTypes = [
private readonly FrozenDictionary<string, string> _compilerAssemblyMap;

GetRedirectEntry(typeof(CodeAnalysis.Razor.CompilerFeatures)), // Microsoft.CodeAnalysis.Razor.Compiler
GetRedirectEntry(typeof(CodeAnalysis.Razor.CompilerFeatures), "Microsoft.NET.Sdk.Razor.SourceGenerators"),
GetRedirectEntry(typeof(AspNetCore.Razor.ArgHelper)), // Microsoft.AspNetCore.Razor.Utilities.Shared
#pragma warning disable RS0030 // Do not use banned APIs
[ImportingConstructor]
#pragma warning restore RS0030 // Do not use banned APIs
public RazorAnalyzerAssemblyRedirector()
{
ImmutableArray<(string name, string path)> compilerAssemblyTypes = [
GetRedirectEntry(typeof(CodeAnalysis.Razor.CompilerFeatures)), // Microsoft.CodeAnalysis.Razor.Compiler
GetRedirectEntry(typeof(CodeAnalysis.Razor.CompilerFeatures), "Microsoft.NET.Sdk.Razor.SourceGenerators"),
GetRedirectEntry(typeof(AspNetCore.Razor.ArgHelper)), // Microsoft.AspNetCore.Razor.Utilities.Shared

// The following dependencies will be provided by the Compiler ALC so its not strictly required to redirect them, but we do so for completeness.
GetRedirectEntry(typeof(ImmutableArray)), // System.Collections.Immutable
// The following dependencies will be provided by the Compiler ALC so its not strictly required to redirect them, but we do so for completeness.
GetRedirectEntry(typeof(ImmutableArray)), // System.Collections.Immutable

// ObjectPool is special
GetObjectPoolRedirect() // Microsoft.Extensions.ObjectPool
];
// ObjectPool is special
GetObjectPoolRedirect() // Microsoft.Extensions.ObjectPool
];

private static readonly FrozenDictionary<string, string> s_compilerAssemblyMap = s_compilerAssemblyTypes.ToFrozenDictionary(t => t.name, t => t.path);
_compilerAssemblyMap = compilerAssemblyTypes.ToFrozenDictionary(t => t.name, t => t.path);
}

public string? RedirectPath(string fullPath)
{
var name = Path.GetFileNameWithoutExtension(fullPath);
return s_compilerAssemblyMap.TryGetValue(name, out var path) ? path : null;
return _compilerAssemblyMap.TryGetValue(name, out var path) ? path : null;
}

private static (string name, string path) GetObjectPoolRedirect()
Expand Down
Loading