Skip to content

Commit

Permalink
[mono][tmp] Restrict use of /tv: to 15.0
Browse files Browse the repository at this point in the history
This is because other toolsets are being added from xbuild, like 14.0,
but that causes xbuild targets to be loaded with msbuild assemblies,
roslyn targets etc - not a good mix.

Disabling this for now. And we should probably simply not be adding any
of the xbuild toolsets!
  • Loading branch information
Ankit Jain committed May 3, 2017
1 parent bc2ec1c commit 5c7ae38
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/MSBuild/XMake.cs
Expand Up @@ -1015,10 +1015,19 @@ ISet<string> warningsAsMessages
Environment.SetEnvironmentVariable("MSBUILDDEBUGGING", "1");
}

#if MONO
// FIXME: Remove toolsVersion added from xbuild and then remove this too
if (toolsVersion != null && toolsVersion != MSBuildConstants.CurrentToolsVersion)
{
var toolset = projectCollection.GetToolset(MSBuildConstants.CurrentToolsVersion);
ThrowInvalidToolsVersionInitializationException(new Toolset[] {toolset}, toolsVersion);
}
#else
if (toolsVersion != null && !projectCollection.ContainsToolset(toolsVersion))
{
ThrowInvalidToolsVersionInitializationException(projectCollection.Toolsets, toolsVersion);
}
#endif

#if FEATURE_XML_SCHEMA_VALIDATION
// If the user has requested that the schema be validated, do that here.
Expand Down

0 comments on commit 5c7ae38

Please sign in to comment.