diff --git a/src/Microsoft.OData.Client/DataServiceContext.cs b/src/Microsoft.OData.Client/DataServiceContext.cs
index 69853a8aa5..94d6b1f684 100644
--- a/src/Microsoft.OData.Client/DataServiceContext.cs
+++ b/src/Microsoft.OData.Client/DataServiceContext.cs
@@ -112,13 +112,11 @@ public class DataServiceContext
/// resolve typename from a type
private Func resolveType;
-#if !PORTABLELIB // Timeout not available
/// time-out value in seconds, 0 for default
private int timeout;
/// read or write time-out value in seconds, 0 for default
private int readWriteTimeout;
-#endif
/// whether to use post-tunneling for PUT/DELETE
private bool postTunneling;
@@ -483,7 +481,6 @@ public virtual Func ResolveType
set { this.resolveType = value; }
}
-#if !PORTABLELIB // Timeout not available
/// Gets or sets the time-out option (in seconds) that is used for the underlying HTTP request to the data service.
/// An integer that indicates the time interval (in seconds) before time-out of a service request.
///
@@ -537,7 +534,6 @@ public virtual int ReadWriteTimeout
this.readWriteTimeout = value;
}
}
-#endif
/// Gets or sets a Boolean value that indicates whether to use post tunneling.
/// A Boolean value that indicates whether to use post tunneling.
diff --git a/src/Microsoft.OData.Client/InternalODataRequestMessage.cs b/src/Microsoft.OData.Client/InternalODataRequestMessage.cs
index 47872be908..7ac3923a04 100644
--- a/src/Microsoft.OData.Client/InternalODataRequestMessage.cs
+++ b/src/Microsoft.OData.Client/InternalODataRequestMessage.cs
@@ -105,7 +105,6 @@ public override ICredentials Credentials
set { throw new NotSupportedException(); }
}
-#if !PORTABLELIB
///
/// Gets or sets the timeout (in seconds) for this request.
///
@@ -140,7 +139,6 @@ public override bool SendChunked
throw new NotImplementedException();
}
}
-#endif
///
/// internal headers dictionary
diff --git a/src/Microsoft.OData.Client/ODataRequestMessageWrapper.cs b/src/Microsoft.OData.Client/ODataRequestMessageWrapper.cs
index f00ace27d2..23697625b7 100644
--- a/src/Microsoft.OData.Client/ODataRequestMessageWrapper.cs
+++ b/src/Microsoft.OData.Client/ODataRequestMessageWrapper.cs
@@ -157,7 +157,6 @@ internal static ODataRequestMessageWrapper CreateRequestMessageWrapper(BuildingR
requestMessage.Credentials = requestInfo.Credentials;
}
-#if !PORTABLELIB // Timeout not available
if (requestInfo.Timeout != 0)
{
requestMessage.Timeout = requestInfo.Timeout;
@@ -168,7 +167,6 @@ internal static ODataRequestMessageWrapper CreateRequestMessageWrapper(BuildingR
{
requestMessage.ReadWriteTimeout = requestInfo.ReadWriteTimeout;
}
-#endif
return new TopLevelRequestMessageWrapper(requestMessage, requestInfo, requestMessageArgs.Descriptor);
}
diff --git a/src/Microsoft.OData.Client/RequestInfo.cs b/src/Microsoft.OData.Client/RequestInfo.cs
index ed74ebd877..010fa51f5f 100644
--- a/src/Microsoft.OData.Client/RequestInfo.cs
+++ b/src/Microsoft.OData.Client/RequestInfo.cs
@@ -148,7 +148,6 @@ internal System.Net.ICredentials Credentials
get { return this.Context.Credentials; }
}
-#if !PORTABLELIB
///
/// Get the timeout span in seconds to use for the underlying HTTP request to the data service.
///
@@ -165,8 +164,6 @@ internal int ReadWriteTimeout
get { return this.Context.ReadWriteTimeout; }
}
-#endif
-
///
/// Whether to use post-tunneling for PUT/DELETE.
///
diff --git a/src/Microsoft.OData.Client/Serialization/DataServiceClientRequestMessage.cs b/src/Microsoft.OData.Client/Serialization/DataServiceClientRequestMessage.cs
index f4d0901006..b059685ae2 100644
--- a/src/Microsoft.OData.Client/Serialization/DataServiceClientRequestMessage.cs
+++ b/src/Microsoft.OData.Client/Serialization/DataServiceClientRequestMessage.cs
@@ -61,7 +61,6 @@ public abstract string Method
///
public abstract ICredentials Credentials { get; set; }
-#if !PORTABLELIB
///
/// Gets or sets the timeout (in seconds) for this request.
///
@@ -71,7 +70,6 @@ public abstract string Method
/// Gets or sets the read and write timeout (in seconds) for this request.
///
public abstract int ReadWriteTimeout { get; set; }
-#endif
///
/// Gets or sets a value that indicates whether to send data in segments to the
diff --git a/src/Microsoft.OData.Client/Serialization/HttpWebRequestMessage.cs b/src/Microsoft.OData.Client/Serialization/HttpWebRequestMessage.cs
index d17c3ff5be..66f62268a7 100644
--- a/src/Microsoft.OData.Client/Serialization/HttpWebRequestMessage.cs
+++ b/src/Microsoft.OData.Client/Serialization/HttpWebRequestMessage.cs
@@ -177,7 +177,6 @@ public override System.Net.ICredentials Credentials
set { this.httpRequest.Credentials = value; }
}
-#if !PORTABLELIB
///
/// Gets or sets the timeout (in seconds) for this request.
///
@@ -205,7 +204,7 @@ public override bool SendChunked
get { return this.httpRequest.SendChunked; }
set { this.httpRequest.SendChunked = value; }
}
-#endif
+
#endregion
///