Skip to content

Load core NuGet assemblies. #93

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

Closed
Chryssie wants to merge 1 commit into from
Closed

Load core NuGet assemblies. #93

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
25 changes: 21 additions & 4 deletions src/MSBuildLocator/MSBuildLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace Microsoft.Build.Locator
public static class MSBuildLocator
{
private const string MSBuildPublicKeyToken = "b03f5f7f11d50a3a";
private const string NuGetPublicKeyToken = "31bf3856ad364e35";

private static readonly string[] s_msBuildAssemblies =
{
Expand All @@ -26,6 +27,13 @@ public static class MSBuildLocator
"Microsoft.Build.Tasks.Core",
"Microsoft.Build.Utilities.Core"
};
private static readonly string[] s_nuGetAssemblyNames = {
"NuGet.Common",
"NuGet.Frameworks",
"NuGet.Packaging",
"NuGet.ProjectModel",
"NuGet.Versioning"
};

#if NET46
private static ResolveEventHandler s_registeredHandler;
Expand Down Expand Up @@ -209,7 +217,7 @@ Assembly TryLoadAssembly(AssemblyName assemblyName)
if (File.Exists(targetAssembly))
{
// Automatically unregister the handler once all supported assemblies have been loaded.
if (Interlocked.Increment(ref numResolvedAssemblies) == s_msBuildAssemblies.Length)
if (Interlocked.Increment(ref numResolvedAssemblies) == (s_msBuildAssemblies.Length + s_nuGetAssemblyNames.Length))
{
Unregister();
}
Expand Down Expand Up @@ -287,11 +295,20 @@ private static void ApplyDotNetSdkEnvironmentVariables(string dotNetSdkPath)

private static bool IsMSBuildAssembly(AssemblyName assemblyName)
{
if (!s_msBuildAssemblies.Contains(assemblyName.Name, StringComparer.OrdinalIgnoreCase))
if (s_msBuildAssemblies.Contains(assemblyName.Name, StringComparer.OrdinalIgnoreCase))
{
return false;
return HasPublicKeyToken(assemblyName, MSBuildPublicKeyToken);
}
if (s_nuGetAssemblyNames.Contains(assemblyName.Name, StringComparer.OrdinalIgnoreCase))
{
return HasPublicKeyToken(assemblyName, NuGetPublicKeyToken);
}

return false;
}

private static bool HasPublicKeyToken(AssemblyName assemblyName, string expectedPublicKeyToken)
{
var publicKeyToken = assemblyName.GetPublicKeyToken();
if (publicKeyToken == null || publicKeyToken.Length == 0)
{
Expand All @@ -304,7 +321,7 @@ private static bool IsMSBuildAssembly(AssemblyName assemblyName)
sb.Append($"{b:x2}");
}

return sb.ToString().Equals(MSBuildPublicKeyToken, StringComparison.OrdinalIgnoreCase);
return sb.ToString().Equals(expectedPublicKeyToken, StringComparison.OrdinalIgnoreCase);
}

private static IEnumerable<VisualStudioInstance> GetInstances(VisualStudioInstanceQueryOptions options)
Expand Down