Fix net_4_0 build.

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
index 43f20dad9b6397a9cbdbc68a6cc601cf83ff35bb..2d324e814ca6e17acec560fd8df056c31c1c417f 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_4_5
 
 using Microsoft.Build.Framework;
 using System;
@@ -35,7 +34,10 @@ using System.Collections.Generic;
 namespace Microsoft.Build.Construction
 {
        [Serializable]
-       public abstract class ElementLocation
+#if NET_4_5
+       public
+#endif
+       abstract class ElementLocation
        {
                public abstract int Column { get; }
                public abstract string File { get; }
@@ -46,5 +48,3 @@ namespace Microsoft.Build.Construction
                }
        }
 }
-
-#endif

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
index 31d2cd36898b7aea84a1bfa1176baf35cc4a6f49..2dda9065d0a296af2d248b134f2665c3e054a676 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
@@ -455,7 +455,12 @@ namespace Microsoft.Build.Evaluation
 
                public bool SkipEvaluation { get; set; }
 
-               public IDictionary<string, ProjectTargetInstance> Targets {
+               #if NET_4_5
+               public
+               #else
+               internal
+               #endif
+               IDictionary<string, ProjectTargetInstance> Targets {
                        get { return targets; }
                }
        }

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
index d95cfcadd98c7ab636933a74dacb7d5dbb5153e7..69709baeb793251c5730c832852573e2c36b454d 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/ProjectCollection.cs
@@ -49,7 +49,11 @@ namespace Microsoft.Build.Evaluation
 
                static ProjectCollection ()
                {
+                       #if NET_4_5
                        global_project_collection = new ProjectCollection (new ReadOnlyDictionary<string, string> (new Dictionary<string, string> ()));
+                       #else
+                       global_project_collection = new ProjectCollection (new Dictionary<string, string> ());
+                       #endif
                }
 
                public static string Escape (string unescapedString)

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Toolset.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Toolset.cs
index 8ed2734a34f092d96b16680a7b59fb6372aae3ea..813ca9902a1e1f480344e3de26e511bd7ec01d0a 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Toolset.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Toolset.cs
@@ -60,7 +60,9 @@ namespace Microsoft.Build.Evaluation
                                buildProperties == null ?
                                new Dictionary<string, ProjectPropertyInstance> () :
                                buildProperties.Select (p => new ProjectPropertyInstance (p.Key) { EvaluatedValue = p.Value }).ToDictionary (e => e.Name);
+#if NET_4_5
                        SubToolsets = subToolsets ?? new Dictionary<string, SubToolset> ();
+#endif
                }
 
 #if NET_4_5

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
index 0e8ead560263964e7f610383f22ed6902ec859cf..78949a4f2d54b7bbe238d02435d2785c9492fbe1 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs
@@ -125,7 +125,12 @@ namespace Microsoft.Build.Execution
                        get { throw new NotImplementedException (); }
                }
                
-               public IDictionary<string, ProjectTargetInstance> Targets {
+               #if NET_4_5
+               public
+               #else
+               internal
+               #endif
+               IDictionary<string, ProjectTargetInstance> Targets {
                        get { throw new NotImplementedException (); }
                }