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.

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

Ship Devkit dependencies as a nuget package to support directly including in the C# extension #70875

Merged
merged 2 commits into from
Nov 21, 2023

Conversation

dibarbet
Copy link
Member

@dibarbet dibarbet commented Nov 17, 2023

See client side PR for details - dotnet/vscode-csharp#6681

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Nov 17, 2023
@@ -33,7 +31,7 @@ private AssemblyLoadContextWrapper(AssemblyLoadContext assemblyLoadContext, Immu
_logger = logger;
}

public static bool TryLoadExtension(string assemblyFilePath, string? sharedDependenciesPath, ILogger? logger, [NotNullWhen(true)] out Assembly? assembly)
public static bool TryLoadExtension(string assemblyFilePath, ILogger? logger, [NotNullWhen(true)] out Assembly? assembly)
Copy link
Member Author

Choose a reason for hiding this comment

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

@tmat would like you're review on this PR (but especially here). Seems unnecessary to load shared deps from devkit now. Smoke test on telemetry and hot reload works.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I think it'd even be incorrect to do so. We don't want to depend on versions of assemblies shipping in the DevKit.

@dibarbet dibarbet marked this pull request as ready for review November 17, 2023 23:41
@dibarbet dibarbet requested review from a team as code owners November 17, 2023 23:41
// Use the SharedDependenciesPath option as a proxy for whether or not devkit is running.
var isDevkitEnabled = !string.IsNullOrEmpty(serverConfiguration.SharedDependenciesPath);
// Check if the devkit extension is included to see if devkit is enabled.
var isDevkitEnabled = serverConfiguration.ExtensionAssemblyPaths.Any(path => path.Contains("Microsoft.VisualStudio.LanguageServices.DevKit.dll"));
Copy link
Member

Choose a reason for hiding this comment

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

I think this would be better: path => Path.GetFileName(path) == "..."

@dibarbet dibarbet merged commit d1b2e28 into dotnet:main Nov 21, 2023
27 checks passed
@dibarbet dibarbet deleted the remove_npm branch November 21, 2023 18:57
@ghost ghost added this to the Next milestone Nov 21, 2023
@RikkiGibson RikkiGibson modified the milestones: Next, 17.9 P2 Nov 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants