Skip to content

Commit

Permalink
Reuse Roslyn's analyzer assembly loader
Browse files Browse the repository at this point in the history
Roslyn has made some improvements to better handle the case where
analyzers or generators have a mix of assembly versions, such as
in microsoft/CsWin32#218. The Roslyn
changes were made in dotnet/roslyn#56432, and
this consumes it.
  • Loading branch information
jasonmalinowski committed Jan 26, 2022
1 parent 8f18443 commit 85f35cf
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 537 deletions.
4 changes: 2 additions & 2 deletions src/OmniSharp.Host/CompositionHostBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
using OmniSharp.Eventing;
using OmniSharp.FileSystem;
using OmniSharp.FileWatching;
using OmniSharp.Host.Services;
using OmniSharp.Mef;
using OmniSharp.MSBuild.Discovery;
using OmniSharp.Options;
using OmniSharp.Roslyn;
using OmniSharp.Roslyn.Utilities;
using OmniSharp.Services;

namespace OmniSharp
Expand Down Expand Up @@ -137,7 +137,7 @@ public static IServiceProvider CreateDefaultServiceProvider(
// Caching
services.AddSingleton<IMemoryCache, MemoryCache>();
services.AddSingleton<IAssemblyLoader, AssemblyLoader>();
services.AddSingleton<IAnalyzerAssemblyLoader, DefaultAnalyzerAssemblyLoader>();
services.AddSingleton(sp => ShadowCopyAnalyzerAssemblyLoader.Instance);
services.AddOptions();

// Setup the options from configuration
Expand Down
327 changes: 0 additions & 327 deletions src/OmniSharp.Host/Services/AnalyzerAssemblyLoader.cs

This file was deleted.

Loading

0 comments on commit 85f35cf

Please sign in to comment.