Add support for ToolsVersion and correctly build msbuild+xbuild assemblies

[mono.git] / mcs / class / Microsoft.Build.Tasks / Microsoft.Build.Tasks / MSBuild.cs

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
index 592a41221238d031de3d054a265187f5f93dffd7..564bbb283031df86110de8a8a73940d9a1e8d8fb 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
@@ -82,7 +82,14 @@ namespace Microsoft.Build.Tasks {
                                outputs = new Hashtable ();
 
                                try {
-                                       result = BuildEngine.BuildProjectFile (filename, targets, global_properties, outputs);
+                                       // Order of precedence:
+                                       // %(Project.ToolsVersion) , ToolsVersion property
+                                       string tv = project.GetMetadata ("ToolsVersion");
+                                       if (String.IsNullOrEmpty (tv))
+                                               tv = ToolsVersion;
+                                       ThrowIfNotValidToolsVersion (tv);
+
+                                       result = BuildEngine2.BuildProjectFile (filename, targets, global_properties, outputs, tv);
                                } catch (InvalidProjectFileException e) {
                                        Log.LogError ("Error building project {0}: {1}", filename, e.Message);
                                        result = false;
@@ -127,6 +134,12 @@ namespace Microsoft.Build.Tasks {
                        return result;
                }
 
+               void ThrowIfNotValidToolsVersion (string toolsVersion)
+               {
+                       if (!String.IsNullOrEmpty (toolsVersion) && Engine.GlobalEngine.Toolsets [toolsVersion] == null)
+                               throw new Exception (String.Format ("Unknown ToolsVersion : {0}", toolsVersion));
+               }
+
                [Required]
                public ITaskItem [] Projects {
                        get { return projects; }
@@ -170,6 +183,10 @@ namespace Microsoft.Build.Tasks {
                        set { buildInParallel = value; }
                }
 
+               public string ToolsVersion {
+                       get; set;
+               }
+
                Dictionary<string, string> SplitPropertiesToDictionary ()
                {
                        if (properties == null)