Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8ae3b7b
Cache MEF catalog in servicehub process
ToddGrun Apr 11, 2025
f1dcf0a
1) Get rid of MS.Extensions.Logging dependency
ToddGrun Apr 11, 2025
9ff80c0
Check cancellation token after doing expensive operation
ToddGrun Apr 11, 2025
17d73d7
Include the Env version in the hash, not in the path
ToddGrun Apr 11, 2025
dbfb724
Remove unused variable
ToddGrun Apr 11, 2025
7103a4f
fix a unit test issue
ToddGrun Apr 12, 2025
97edeb6
Merge branch 'dotnet:main' into dev/toddgrun/4-11-MEF-Caching-In-Serv…
ToddGrun Apr 12, 2025
87a1d96
merge main
ToddGrun Apr 15, 2025
0014f71
1) Properly fix merge conflict
ToddGrun Apr 15, 2025
36df091
1) Use ArrayBuilder instead of Enumerable.Concat
ToddGrun Apr 15, 2025
e5b9416
Merge branch 'dotnet:main' into dev/toddgrun/4-11-MEF-Caching-In-Serv…
ToddGrun Apr 16, 2025
38d0567
Move some methods from static to instance based and make the Language…
ToddGrun Apr 16, 2025
b4e5b8e
remove accidental debug aid
ToddGrun Apr 16, 2025
b542f43
1) Return an error message (if encountered) during initialization and…
ToddGrun Apr 17, 2025
acbb93d
Fix build, cosmetic suggestions in PR
ToddGrun Apr 17, 2025
9dc7404
Merge branch 'dotnet:main' into dev/toddgrun/4-11-MEF-Caching-In-Serv…
ToddGrun Apr 18, 2025
fdaa909
Temporary workaround until the razor EA issue is addressed
ToddGrun Apr 19, 2025
a6e5fbb
fix linting issue when temporarily commenting out code
ToddGrun Apr 19, 2025
bbaff4e
Handlre razor external access assembly mef loading issue better
ToddGrun Apr 21, 2025
e9176c9
1) Fix more unit tests due to razor EA
ToddGrun Apr 21, 2025
584f74b
Merge branch 'dotnet:main' into dev/toddgrun/4-11-MEF-Caching-In-Serv…
ToddGrun Apr 22, 2025
6886404
Cleanup after razor EA cleanup
ToddGrun Apr 22, 2025
3020cb9
cleanup the cleanup
ToddGrun Apr 22, 2025
57da43b
1) Rename variable
ToddGrun Apr 22, 2025
012c2bd
1) Remove unuseful doc comment
ToddGrun Apr 22, 2025
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
1 change: 1 addition & 0 deletions eng/targets/Services.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.MissingImportDiscovery" ClassName="Microsoft.CodeAnalysis.Remote.RemoteMissingImportDiscoveryService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.NavigateToSearch" ClassName="Microsoft.CodeAnalysis.Remote.RemoteNavigateToSearchService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.NavigationBarItem" ClassName="Microsoft.CodeAnalysis.Remote.RemoteNavigationBarItemService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.Initialization" ClassName="Microsoft.CodeAnalysis.Remote.RemoteInitializationService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.ProcessTelemetry" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProcessTelemetryService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.ProjectTelemetry" ClassName="Microsoft.CodeAnalysis.Remote.RemoteProjectTelemetryService+Factory" />
<ServiceHubService Include="Microsoft.VisualStudio.LanguageServices.RelatedDocuments" ClassName="Microsoft.CodeAnalysis.Remote.RemoteRelatedDocumentsService+Factory" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private static ImmutableArray<Assembly> CreateAssemblies(string languageName)
}

return MefHostServices.DefaultAssemblies.Concat(
MefHostServicesHelpers.LoadNearbyAssemblies(assemblyNames));
MefHostServicesHelpers.LoadNearbyAssemblies(assemblyNames.ToImmutableAndClear()));
}

IEnumerable<Lazy<TExtension>> IMefHostExportProvider.GetExports<TExtension>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ public ImportType(ExportedType t) { }

private async Task AssertCacheWriteWasAttemptedAsync()
{
var cacheWriteTask = ExportProviderBuilder.TestAccessor.GetCacheWriteTask();
var cacheWriteTask = LanguageServerExportProviderBuilder.TestAccessor.GetCacheWriteTask();
Assert.NotNull(cacheWriteTask);

await cacheWriteTask;
}

private void AssertNoCacheWriteWasAttempted()
{
var cacheWriteTask2 = ExportProviderBuilder.TestAccessor.GetCacheWriteTask();
var cacheWriteTask2 = LanguageServerExportProviderBuilder.TestAccessor.GetCacheWriteTask();
Assert.Null(cacheWriteTask2);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public static Task<ExportProvider> CreateExportProviderAsync(
UseStdIo: false);
var extensionManager = ExtensionAssemblyManager.Create(serverConfiguration, loggerFactory);
assemblyLoader = new CustomExportAssemblyLoader(extensionManager, loggerFactory);
return ExportProviderBuilder.CreateExportProviderAsync(extensionManager, assemblyLoader, devKitDependencyPath, cacheDirectory, loggerFactory);

return LanguageServerExportProviderBuilder.CreateExportProviderAsync(extensionManager, assemblyLoader, devKitDependencyPath, cacheDirectory, loggerFactory, CancellationToken.None);
}
}

This file was deleted.

Loading