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

Remove workaround for .net7 r2r assembly loading issue #72603

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Remove workaround for .net7 r2r assembly loading issue #72603

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
10 changes: 0 additions & 10 deletions src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/ExportProviderBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@ public static async Task<ExportProvider> CreateExportProviderAsync(ExtensionAsse
var assemblyPaths = Directory.EnumerateFiles(baseDirectory, "Microsoft.CodeAnalysis*.dll");
assemblyPaths = assemblyPaths.Concat(Directory.EnumerateFiles(baseDirectory, "Microsoft.ServiceHub*.dll"));

// Temporarily explicitly load the dlls we want to add to the MEF composition. This is due to a runtime bug
// in the 7.0.4 runtime where the APIs MEF uses to load assemblies break with R2R assemblies.
// See https://github.com/dotnet/runtime/issues/83526
//
// Once a newer version of the runtime is widely available, we can remove this.
foreach (var path in assemblyPaths)
{
Assembly.LoadFrom(path);
}

// DevKit assemblies are not shipped in the main language server folder
// and not included in ExtensionAssemblyPaths (they get loaded into the default ALC).
// So manually add them to the MEF catalog here.
Expand Down
Loading