Skip to content

Find x64 MSBuild from Locator #135

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

Merged
Forgind merged 3 commits into from
Oct 25, 2021
Merged

Find x64 MSBuild from Locator #135

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4dc179
Find x64 MSBuild from Locator
Forgind Sep 20, 2021
3e9aee3
PR Comments
Forgind Sep 21, 2021
968b897
Check for .NET Framework
Forgind Oct 11, 2021
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
23 changes: 22 additions & 1 deletion src/MSBuildLocator/MSBuildLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading;

#if NETCOREAPP
using System.Runtime.Loader;
Expand Down Expand Up @@ -209,6 +209,27 @@ public static void RegisterMSBuildPath(string[] msbuildSearchPaths)
// AssemblyResolve event can fire multiple times for the same assembly, so keep track of what's already been loaded.
var loadedAssemblies = new Dictionary<string, Assembly>();

#if NET46
// MSBuild can be loaded from the x86 or x64 folder. Before 17.0, it looked next to the executing assembly in some cases and constructed a path that assumed x86 in others.
Comment thread
rainersigwald marked this conversation as resolved.
// This overrides the latter assumption to let it find the right MSBuild.
foreach (string path in msbuildSearchPaths)
Comment thread
rainersigwald marked this conversation as resolved.
{
string msbuildExe = Path.Combine(path, "MSBuild.exe");
if (File.Exists(msbuildExe))
{
if (FileVersionInfo.GetVersionInfo(msbuildExe).FileMajorPart < 17)
Comment thread
rainersigwald marked this conversation as resolved.
{
if (Path.GetDirectoryName(msbuildExe).EndsWith(@"\amd64", StringComparison.OrdinalIgnoreCase))
{
msbuildExe = Path.Combine(path.Substring(0, path.Length - 6), "MSBuild.exe");
}
Environment.SetEnvironmentVariable("MSBUILD_EXE_PATH", msbuildExe);
}
break;
}
}
#endif

// Saving the handler in a static field so it can be unregistered later.
#if NET46
s_registeredHandler = (_, eventArgs) =>
Expand Down