Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Data.Services/System.Data.Services/DataService.cs

@@ -36,9 +36,7 @@ namespace System.Data.Services {
 	[AspNetCompatibilityRequirements (RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
 	public class DataService<T> : IRequestHandler
 	{
-#if NET_4_0
 		DataServiceProcessingPipeline processingPipeline;
-#endif
 		public void AttachHost (IDataServiceHost host)
 		{
 			if (host == null)
@@ -63,7 +61,6 @@ namespace System.Data.Services {
 		protected T CurrentDataSource {
 			get; private set;
 		}
-#if NET_4_0
 		public DataServiceProcessingPipeline ProcessingPipeline {
 			get {
 				if (processingPipeline == null)
@@ -71,7 +68,6 @@ namespace System.Data.Services {
 				return processingPipeline;
 			}
 		}
-#endif
 		protected virtual T CreateDataSource()
 		{
 			throw new NotImplementedException();

mcs/class/System.Data.Services/System.Data.Services/ExpandSegment.cs

@@ -30,9 +30,7 @@ using System.Diagnostics;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-#if NET_4_0
 using System.Data.Services.Providers;
-#endif
 
 namespace System.Data.Services
 {
@@ -47,13 +45,11 @@ namespace System.Data.Services
 			this.Name = name;
 			this.Filter = filter;
 		}
-#if NET_4_0
 		public ResourceProperty ExpandedProperty {
 			get {
 				throw new NotImplementedException ();
 			}
 		}
-#endif
 		public string Name {
 			get;
 			private set;

mcs/class/System.Data.Services/System.Data.Services/ProcessRequestArgs.cs

@@ -30,11 +30,9 @@ namespace System.Data.Services
 {
 	public sealed class ProcessRequestArgs
 	{
-#if NET_4_0
 		public DataServiceOperationContext OperationContext {
 			get; private set;
 		}
-#endif
 		public bool IsBatchOperation {
 			get; private set;
 		}