Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectInstance.cs

@@ -99,9 +99,7 @@ namespace Microsoft.Build.Execution
 		IDictionary<string, string> global_properties;
 		
 		string full_path, directory;
-		#if NET_4_5
 		ElementLocation location;
-		#endif
 		
 		Dictionary<string, ProjectItemDefinitionInstance> item_definitions;
 		List<ResolvedImport> raw_imports; // maybe we don't need this...
@@ -146,9 +144,7 @@ namespace Microsoft.Build.Execution
 
 		void InitializeProperties (ProjectRootElement xml)
 		{
-			#if NET_4_5
 			location = xml.Location;
-			#endif
 			full_path = xml.FullPath;
 			directory = string.IsNullOrWhiteSpace (xml.DirectoryPath) ? System.IO.Directory.GetCurrentDirectory () : xml.DirectoryPath;
 			InitialTargets = xml.InitialTargets.Split (item_target_sep, StringSplitOptions.RemoveEmptyEntries).Select (s => s.Trim ()).ToList ();
@@ -334,11 +330,9 @@ namespace Microsoft.Build.Execution
 		
 		public List<string> InitialTargets { get; private set; }
 		
-#if NET_4_5		
 		public bool IsImmutable {
 			get { throw new NotImplementedException (); }
 		}
-#endif
 		
 		public IDictionary<string, ProjectItemDefinitionInstance> ItemDefinitions {
 			get { return item_definitions; }
@@ -352,21 +346,15 @@ namespace Microsoft.Build.Execution
 			get { return all_evaluated_items.Select (i => i.ItemType).Distinct ().ToArray (); }
 		}
 
-#if NET_4_5		
 		public ElementLocation ProjectFileLocation {
 			get { return location; }
 		}
-#endif
 
 		public ICollection<ProjectPropertyInstance> Properties {
 			get { return properties.Values; }
 		}
 		
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		IDictionary<string, ProjectTargetInstance> Targets {
 			get { return targets; }
 		}
@@ -521,12 +509,10 @@ namespace Microsoft.Build.Execution
 			throw new NotImplementedException ();
 		}
 		
-#if NET_4_5
 		public void UpdateStateFrom (ProjectInstance projectState)
 		{
 			throw new NotImplementedException ();
 		}
-#endif
 		
 		// static members		
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectItemGroupTaskInstance.cs

@@ -51,29 +51,17 @@ namespace Microsoft.Build.Execution
 			get { return condition; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation ConditionLocation {
 			get { return condition_location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation Location {
 			get { return location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		ElementLocation ExecuteTargetsLocation { get; private set; }
 		
 		public ICollection<ProjectItemGroupTaskItemInstance> Items { get; private set; }

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectItemGroupTaskItemInstance.cs

@@ -41,7 +41,6 @@ namespace Microsoft.Build.Execution
 			ItemType = xml.ItemType;
 			Metadata = xml.Metadata.Select (m => new ProjectItemGroupTaskMetadataInstance (m)).ToArray ();
 			Remove = xml.Remove;
-			#if NET_4_5
 			KeepDuplicates = xml.KeepDuplicates;
 			KeepMetadata = xml.KeepMetadata;
 			RemoveMetadata = xml.RemoveMetadata;
@@ -53,7 +52,6 @@ namespace Microsoft.Build.Execution
 			KeepDuplicatesLocation = xml.KeepDuplicatesLocation;
 			RemoveLocation = xml.RemoveLocation;
 			RemoveMetadataLocation = xml.RemoveMetadataLocation;			
-			#endif
 		}
 		
 		public string Condition { get; private set; }
@@ -73,7 +71,6 @@ namespace Microsoft.Build.Execution
 		public string Remove { get; private set; }
 
 		public string RemoveMetadata { get; private set; }
-		#if NET_4_5
 		public ElementLocation ConditionLocation { get; private set; }
 
 		public ElementLocation ExcludeLocation { get; private set; }
@@ -89,7 +86,6 @@ namespace Microsoft.Build.Execution
 		public ElementLocation RemoveLocation { get; private set; }
 
 		public ElementLocation RemoveMetadataLocation { get; private set; }
-		#endif
 	}
 }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectItemGroupTaskMetadataInstance.cs

@@ -38,21 +38,17 @@ namespace Microsoft.Build.Execution
 			Condition = xml.Condition;
 			Name = xml.Name;
 			Value = xml.Value;
-			#if NET_4_5
 			ConditionLocation = xml.ConditionLocation;
 			Location = xml.Location;
-			#endif
 		}
 		public string Condition { get; private set; }
 
 		public string Name { get; private set; }
 
 		public string Value { get; private set; }
-		#if NET_4_5
 		public ElementLocation ConditionLocation { get; private set; }
 
 		public ElementLocation Location { get; private set; }
-		#endif
 	}
 }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectOnErrorInstance.cs

@@ -36,11 +36,9 @@ namespace Microsoft.Build.Execution
 			condition = xml.Condition;
 			ExecuteTargets = xml.ExecuteTargetsAttribute;
 			//this.FullPath = fullPath;
-			#if NET_4_5
 			condition_location = xml.ConditionLocation;
 			ExecuteTargetsLocation = xml.ExecuteTargetsAttributeLocation;
 			location = xml.Location;
-			#endif
 		}
 		
 		readonly string condition;
@@ -53,27 +51,15 @@ namespace Microsoft.Build.Execution
 		
 		readonly ElementLocation condition_location, location;
 		
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation ConditionLocation {
 			get { return condition_location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		ElementLocation ExecuteTargetsLocation { get; private set; }
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation Location {
 			get { return location; }
 		}

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskInstance.cs

@@ -51,29 +51,17 @@ namespace Microsoft.Build.Execution
 			get { return condition; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation ConditionLocation {
 			get { return condition_location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation Location {
 			get { return location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		ElementLocation ExecuteTargetsLocation { get; private set; }
 		
 		public ICollection<ProjectPropertyGroupTaskPropertyInstance> Properties { get; private set; }

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectPropertyGroupTaskPropertyInstance.cs

@@ -39,10 +39,8 @@ namespace Microsoft.Build.Execution
 			Condition = xml.Condition;
 			Name = xml.Name;
 			Value = xml.Value;
-			#if NET_4_5
 			ConditionLocation = xml.ConditionLocation;
 			Location = xml.Location;
-			#endif
 		}
 		
 		public string Condition { get; private set; }
@@ -51,11 +49,9 @@ namespace Microsoft.Build.Execution
 
 		public string Value { get; private set; }
 
-		#if NET_4_5
 		public ElementLocation ConditionLocation { get; private set; }
 
 		public ElementLocation Location { get; private set; }
-		#endif
 	}
 }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTargetInstance.cs

@@ -35,9 +35,7 @@ using System.Linq;
 
 namespace Microsoft.Build.Execution
 {
-#if NET_4_5
 	public
-#endif
 	sealed class ProjectTargetInstance
 	{
 		internal ProjectTargetInstance (ProjectTargetElement xml)
@@ -64,7 +62,6 @@ namespace Microsoft.Build.Execution
 			Outputs = xml.Outputs;
 			Returns = xml.Returns;
 			Tasks = xml.Tasks.Select (t => new ProjectTaskInstance (t)).ToArray ();
-			#if NET_4_5
 			AfterTargetsLocation = xml.AfterTargetsLocation;
 			BeforeTargetsLocation = xml.BeforeTargetsLocation;
 			ConditionLocation = xml.ConditionLocation;
@@ -74,7 +71,6 @@ namespace Microsoft.Build.Execution
 			Location = xml.Location;
 			OutputsLocation = xml.OutputsLocation;
 			ReturnsLocation = xml.ReturnsLocation;
-			#endif
 		}
 
 		public ElementLocation AfterTargetsLocation { get; private set; }

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTargetInstanceChild.cs

@@ -34,18 +34,10 @@ namespace Microsoft.Build.Execution
 	{
 		public abstract string Condition { get; }
 		public string FullPath { get; internal set; }
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		abstract ElementLocation ConditionLocation { get; }
 		
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		abstract ElementLocation Location { get; }
 	}
 }

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTaskInstance.cs

@@ -47,7 +47,6 @@ namespace Microsoft.Build.Execution
 				throw new NotSupportedException ();
 				}).ToArray ();
 			Parameters = new Dictionary<string,string> (xml.Parameters);
-			#if NET_4_5
 			MSBuildArchitecture = xml.MSBuildArchitecture;
 			MSBuildRuntime = xml.MSBuildRuntime;
 			
@@ -56,7 +55,6 @@ namespace Microsoft.Build.Execution
 			location = xml.Location;
 			MSBuildArchitectureLocation = xml.MSBuildArchitectureLocation;
 			MSBuildRuntimeLocation = xml.MSBuildRuntimeLocation;
-			#endif
 		}
 		
 		string condition;
@@ -66,27 +64,18 @@ namespace Microsoft.Build.Execution
 		
 		ElementLocation condition_location, location;
 		
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation ConditionLocation {
 			get { return condition_location; }
 		}
 
-		#if NET_4_5
 		public
-		#else
-		internal
-		#endif
 		override ElementLocation Location {
 			get { return location; }
 		}
 		
 		public string ContinueOnError { get; private set; }
 		
-		#if NET_4_5
 		public ElementLocation ContinueOnErrorLocation { get; private set; }
 
 		public string MSBuildArchitecture { get; private set; }
@@ -96,7 +85,6 @@ namespace Microsoft.Build.Execution
 		public string MSBuildRuntime { get; private set; }
 
 		public ElementLocation MSBuildRuntimeLocation { get; private set; }
-		#endif
 		
 		public string Name { get; private set; }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTaskInstanceChild.cs

@@ -6,11 +6,9 @@ namespace Microsoft.Build.Execution
 	public abstract class ProjectTaskInstanceChild
 	{
 		public abstract string Condition { get; }
-		#if NET_4_5
 		public abstract ElementLocation ConditionLocation { get; }
 		public abstract ElementLocation Location { get; }
 		public abstract ElementLocation TaskParameterLocation { get; }
-		#endif
 	}
 }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTaskOutputItemInstance.cs

@@ -10,11 +10,9 @@ namespace Microsoft.Build.Execution
 			condition = xml.Condition;
 			ItemType = xml.ItemType;
 			TaskParameter = xml.TaskParameter;
-			#if NET_4_5
 			condition_location = xml.ConditionLocation;
 			location = xml.Location;
 			task_parameter_location = xml.TaskParameterLocation;
-			#endif
 		}
 		
 		public string ItemType { get; private set; }
@@ -24,7 +22,6 @@ namespace Microsoft.Build.Execution
 		public override string Condition {
 			get { return condition; }
 		}
-		#if NET_4_5
 		readonly ElementLocation condition_location, location, task_parameter_location;
 		public ElementLocation ItemTypeLocation { get; private set; }
 		public override ElementLocation ConditionLocation {
@@ -36,7 +33,6 @@ namespace Microsoft.Build.Execution
 		public override ElementLocation TaskParameterLocation {
 			get { return task_parameter_location; }
 		}
-		#endif
 	}
 }
 

mcs/class/Microsoft.Build/Microsoft.Build.Execution/ProjectTaskOutputPropertyInstance.cs

@@ -10,11 +10,9 @@ namespace Microsoft.Build.Execution
 			condition = xml.Condition;
 			PropertyName = xml.PropertyName;
 			TaskParameter = xml.TaskParameter;
-			#if NET_4_5
 			condition_location = xml.ConditionLocation;
 			location = xml.Location;
 			task_parameter_location = xml.TaskParameterLocation;
-			#endif
 		}
 
 		public string PropertyName { get; private set; }
@@ -25,7 +23,6 @@ namespace Microsoft.Build.Execution
 			get { return condition; }
 		}
 		
-		#if NET_4_5
 		readonly ElementLocation condition_location, location, task_parameter_location;
 		public ElementLocation PropertyNameLocation { get; private set; }
 		public override ElementLocation ConditionLocation {
@@ -37,7 +34,6 @@ namespace Microsoft.Build.Execution
 		public override ElementLocation TaskParameterLocation {
 			get { return task_parameter_location; }
 		}
-		#endif
 	}
 }