No need to fill UsingTaskElement content here. Load() takes care of it.

[mono.git] / mcs / class / Microsoft.Build / Microsoft.Build.Construction / ProjectRootElement.cs

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs
index 528f30e4bed5c66174fdf22f9f971a3bc3f595fa..d7d5d77249b84d51a3addaae52efc374236b95fd 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs
@@ -170,7 +170,7 @@ namespace Microsoft.Build.Construction
 
                 string toolsVersion;
                 public string ToolsVersion {
-                        get { return toolsVersion ?? "4.0"; }
+                        get { return toolsVersion ?? string.Empty; }
                         set { toolsVersion = value; }
                 }
 
@@ -185,6 +185,7 @@ namespace Microsoft.Build.Construction
 
                 ProjectRootElement (ProjectCollection projectCollection)
                 {
+                        ToolsVersion = "4.0";
                 }
 
                 public static ProjectRootElement Create ()
@@ -217,6 +218,7 @@ namespace Microsoft.Build.Construction
                 public static ProjectRootElement Create (XmlReader xmlReader, ProjectCollection projectCollection)
                 {
                         var result = Create (projectCollection);
+                        result.ToolsVersion = null;
                         result.Load (xmlReader);
                         return result;
                 }
@@ -467,6 +469,8 @@ namespace Microsoft.Build.Construction
 
                 public void Save ()
                 {
+                        if (FullPath == null)
+                                throw new InvalidOperationException ("This project was not given the file path to write to.");
                         Save (Encoding);
                 }
 
@@ -538,7 +542,8 @@ namespace Microsoft.Build.Construction
                                 AppendChild (def);
                                 return def;
                         case "UsingTask":
-                                return AddUsingTask (null, null, null);
+                                var ut = AddUsingTask (null, null, null);
+                                return ut;
                         case "Choose":
                                 var choose = CreateChooseElement ();
                                 AppendChild (choose);