Skip to content

Fix loading of Mono toolsets #37

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
sarajoiner merged 3 commits into from
Mar 31, 2015
Merged

Fix loading of Mono toolsets #37

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c385b6
Fix loading of Mono toolsets
slluis Mar 26, 2015
d7a6f5d
ToolsetReader fixes for Mono
slluis Mar 27, 2015
c3549f5
Remove unnecessary path handling code in ToolsetReader
slluis Mar 27, 2015
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
27 changes: 20 additions & 7 deletions src/XMakeBuildEngine/Definition/ToolsetReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,28 @@ ToolsetDefinitionLocations locations
var props = new PropertyDictionary<ProjectPropertyInstance>();

var libraryPath = NativeMethodsShared.FrameworkBasePath;
if (!string.IsNullOrEmpty(libraryPath))
{
libraryPath = Path.GetDirectoryName(libraryPath);
}

if (!string.IsNullOrEmpty(libraryPath))
{
var r = new Regex(libraryPath + Path.DirectorySeparatorChar + @"\d+\.\d+");
foreach (var d in Directory.GetDirectories(libraryPath).Where(d => r.IsMatch(d)))
// The 4.0 toolset is installed in the framework directory
var v4dir = FrameworkLocationHelper.GetPathToDotNetFrameworkV40(DotNetFrameworkArchitecture.Current);
if (v4dir != null)
{
toolsets.Add(
"4.0",
new Toolset(
"4.0",
v4dir,
environmentProperties,
globalProperties,
currentDir,
string.Empty));
}

// Other toolsets are installed in the xbuild directory
var xbuildToolsetsDir = Path.Combine(libraryPath, "xbuild");
var r = new Regex(xbuildToolsetsDir + Path.DirectorySeparatorChar + @"\d+\.\d+");
foreach (var d in Directory.GetDirectories(xbuildToolsetsDir).Where(d => r.IsMatch(d)))
{
var version = Path.GetFileName(d);
if (version != null && !toolsets.ContainsKey(version))
Expand All @@ -185,7 +198,7 @@ ToolsetDefinitionLocations locations
version,
new Toolset(
version,
d,
Path.Combine(d,"bin"),
environmentProperties,
globalProperties,
currentDir,
Expand Down