Merge pull request #733 from amoiseev-softheme/bugfix/monofix

[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 0ce0fabfcf9cee642ba0be8f2074be0a1a4f3c11..ddbed1f42c55342d615e3235b4a72d236fbb2070 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectRootElement.cs
@@ -46,7 +46,11 @@ namespace Microsoft.Build.Construction
         {
                 public override string Condition { get { return null; } set { throw new InvalidOperationException (
                         "Can not set Condition."); } }
-                public string DefaultTargets { get; set; }
+                string defaultTargets;
+                public string DefaultTargets {
+                        get { return defaultTargets ?? String.Empty; }
+                        set { defaultTargets = value; }
+                }
 
                 string fullPath;
                 public string FullPath {
@@ -96,7 +100,11 @@ namespace Microsoft.Build.Construction
                                 new FilteredEnumerable<ProjectImportElement> (AllChildren)); }
                 }
 
-                public string InitialTargets { get; set; }
+                string initialTargets;
+                public string InitialTargets {
+                        get { return initialTargets ?? String.Empty; }
+                        set { initialTargets = value; }
+                }
 
                 public ICollection<ProjectItemDefinitionGroupElement> ItemDefinitionGroups {
                         get { return new CollectionFromEnumerable<ProjectItemDefinitionGroupElement> (
@@ -160,9 +168,9 @@ namespace Microsoft.Build.Construction
                         get { return DateTime.Now; }
                 }
 
-                string toolsVersion = "4.0";
+                string toolsVersion;
                 public string ToolsVersion {
-                        get { return toolsVersion; }
+                        get { return toolsVersion ?? "4.0"; }
                         set { toolsVersion = value; }
                 }
 
@@ -540,7 +548,7 @@ namespace Microsoft.Build.Construction
                                 AppendChild (ext);
                                 return ext;
                         default:
-                                throw new NotImplementedException (string.Format (
+                                throw new InvalidProjectFileException (string.Format (
                                         "Child \"{0}\" is not a known node type.", name));
                         }
                 }