Skip to content
Browse files

Sync up ServiceStack for build fixes

  • Loading branch information...
1 parent beb1d32 commit 722c21484e9beee75671ea7f556288822035b2e8 @garuma garuma committed Mar 9, 2013
View
2 ...iceStack/src/ServiceStack.Authentication.OpenId/ServiceStack.Authentication.OpenId.csproj
@@ -76,7 +76,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
View
13 ServiceStack/src/ServiceStack.Common/ServiceClient.Web/ServiceClientBase.cs
@@ -232,6 +232,18 @@ public void SetCredentials(string userName, string password)
this.asyncClient.Timeout = value;
}
}
+
+ private TimeSpan? readWriteTimeout;
+ public TimeSpan? ReadWriteTimeout
+ {
+ get { return this.readWriteTimeout; }
+ set
+ {
+ this.readWriteTimeout = value;
+ // TODO implement ReadWriteTimeout in asyncClient
+ //this.asyncClient.ReadWriteTimeout = value;
+ }
+ }
public virtual string Accept
{
@@ -590,6 +602,7 @@ private WebRequest PrepareWebRequest(string httpMethod, string requestUri, objec
if (Proxy != null) client.Proxy = Proxy;
if (this.Timeout.HasValue) client.Timeout = (int)this.Timeout.Value.TotalMilliseconds;
+ if (this.ReadWriteTimeout.HasValue) client.ReadWriteTimeout = (int)this.ReadWriteTimeout.Value.TotalMilliseconds;
if (this.credentials != null) client.Credentials = this.credentials;
if (this.AlwaysSendBasicAuthHeader) client.AddBasicAuth(this.UserName, this.Password);
View
2 ServiceStack/src/ServiceStack/ServiceStack.csproj
@@ -204,7 +204,7 @@
<Compile Include="WebHost.Endpoints\ActionContext.cs" />
<Compile Include="WebHost.Endpoints\AppHostExtensions.cs" />
<Compile Include="Markdown\CachedExpressionCompiler.cs" />
- <Compile Include="Markdown\DynamicTypeGenerator .cs" />
+ <Compile Include="Markdown\DynamicTypeGenerator.cs" />
<Compile Include="Markdown\ExpressionHelper.cs" />
<Compile Include="Html\HtmlHelper.cs" />
<Compile Include="Html\DisplayTextExtensions.cs" />

0 comments on commit 722c214

Please sign in to comment.
Something went wrong with that request. Please try again.