Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ElementLocation.cs

@@ -34,9 +34,7 @@ using System.Collections.Generic;
 namespace Microsoft.Build.Construction
 {
 	[Serializable]
-#if NET_4_5
 	public
-#endif
 	abstract class ElementLocation
 	{
 		public abstract int Column { get; }

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectElement.cs

@@ -114,15 +114,9 @@ namespace Microsoft.Build.Construction
                                 writer.WriteAttributeString (attributeName, attributeValue);
                 }
                 
-#if NET_4_5
                 public ElementLocation Location { get; private set; }
                 public ElementLocation LabelLocation { get; private set; }
                 public ElementLocation ConditionLocation { get; private set; }
-#else
-                internal ElementLocation Location { get; private set; }
-                internal ElementLocation LabelLocation { get; private set; }
-                internal ElementLocation ConditionLocation { get; private set; }
-#endif
                 string GetFilePath (string baseURI)
                 {
                         return string.IsNullOrEmpty (baseURI) ? string.Empty : new Uri (baseURI).LocalPath;

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectItemElement.cs

@@ -65,23 +65,11 @@ namespace Microsoft.Build.Construction
                 string keepDuplicates;
 		string keepMetadata;
 		string removeMetadata;
-		#if NET_4_5
                 public
-                #else
-                internal
-                #endif
                 string KeepDuplicates { get { return keepDuplicates ?? String.Empty; } set { keepDuplicates = value; } }
-		#if NET_4_5
                 public
-                #else
-                internal
-                #endif
 		string KeepMetadata { get { return keepMetadata ?? String.Empty; } set { keepMetadata = value; } }
-		#if NET_4_5
                 public
-                #else
-                internal
-                #endif
 		string RemoveMetadata { get { return removeMetadata ?? String.Empty; } set { removeMetadata = value; } }
                 
                 public ProjectMetadataElement AddMetadata (string name, string unevaluatedValue)
@@ -142,18 +130,10 @@ namespace Microsoft.Build.Construction
                         AppendChild (metadata);
                         return metadata;
                 }
-#if NET_4_5
                  public ElementLocation ExcludeLocation { get; private set; }
                  public ElementLocation IncludeLocation { get; private set; }
                  public ElementLocation KeepDuplicatesLocation { get; private set; }
                  public ElementLocation RemoveLocation { get; private set; }
                  public ElementLocation RemoveMetadataLocation { get; private set; }
-#else
-                 ElementLocation ExcludeLocation { get; set; }
-                 ElementLocation IncludeLocation { get; set; }
-                 ElementLocation KeepDuplicatesLocation { get; set; }
-                 ElementLocation RemoveLocation { get; set; }
-                 ElementLocation RemoveMetadataLocation { get; set; }
-#endif
         }
 }

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectOnErrorElement.cs

@@ -62,9 +62,7 @@ namespace Microsoft.Build.Construction
                         }
                 }
                 
-                #if NET_4_5
                 public 
-                #endif
                 ElementLocation ExecuteTargetsAttributeLocation { get; set; }
         }
 }

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectOutputElement.cs

@@ -57,13 +57,11 @@ namespace Microsoft.Build.Construction
                         get { return taskParameter ?? String.Empty; }
                         set { taskParameter = value; }
                 }
-                #if NET_4_5
                 ElementLocation taskParameterLocation;
                 public ElementLocation TaskParameterLocation {
                         get { return taskParameterLocation; }
                         set { taskParameterLocation = value; }
                 }
-                #endif
                 internal override string XmlName {
                         get { return "Output"; }
                 }

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectTargetElement.cs

@@ -112,7 +112,6 @@ namespace Microsoft.Build.Construction
                         get { return "Target"; }
                 }
 
-#if NET_4_5
                  public ElementLocation AfterTargetsLocation { get; private set; }
                  public ElementLocation BeforeTargetsLocation { get; private set; }
                  public ElementLocation DependsOnTargetsLocation { get; private set; }
@@ -121,17 +120,6 @@ namespace Microsoft.Build.Construction
                  public ElementLocation NameLocation { get; private set; }
                  public ElementLocation OutputsLocation { get; private set; }
                  public ElementLocation ReturnsLocation { get; private set; }
-#else
-                 internal ElementLocation AfterTargetsLocation { get; set; }
-                 internal ElementLocation BeforeTargetsLocation { get; set; }
-                 internal ElementLocation DependsOnTargetsLocation { get; set; }
-                 internal ElementLocation InputsLocation { get; set; }
-                 internal ElementLocation KeepDuplicateOutputsLocation { get; set; }
-                 internal ElementLocation LabelLocation { get; set; }
-                 internal ElementLocation NameLocation { get; set; }
-                 internal ElementLocation OutputsLocation { get; set; }
-                 internal ElementLocation ReturnsLocation { get; set; }
-#endif
 
                 internal override ProjectElement LoadChildElement (XmlReader reader)
                 {

mcs/class/Microsoft.Build/Microsoft.Build.Construction/ProjectTaskElement.cs

@@ -127,7 +127,6 @@ namespace Microsoft.Build.Construction
                         case "ContinueOnError":
                                 ContinueOnError = value;
                                 break;
-#if NET_4_5
                         case "ExecuteTargets":
                                 ExecuteTargets = value;
                                 break;
@@ -137,7 +136,6 @@ namespace Microsoft.Build.Construction
                         case "MSBuildRuntime":
                                 MSBuildRuntime = value;
                                 break;
-#endif
                         case "xmlns":
                                 break;
                         case "Label":
@@ -162,13 +160,11 @@ namespace Microsoft.Build.Construction
                 private Dictionary<string, string> parameters = new Dictionary<string, string> ();
 
                 public string ExecuteTargets { get; set; }
-                #if NET_4_5
                 public ElementLocation ExecuteTargetsLocation { get; set; }
                 public ElementLocation ContinueOnErrorLocation { get; set; }
                 public string MSBuildArchitecture { get; set; }
                 public ElementLocation MSBuildArchitectureLocation { get; set; }
                 public string MSBuildRuntime { get; set; }
                 public ElementLocation MSBuildRuntimeLocation { get; set; }
-                #endif
         }
 }