Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -56,13 +56,13 @@ namespace System.ServiceModel.Web
}
#endif
public WebChannelFactory(Type serviceType)
: base (serviceType)
public WebChannelFactory(Type channelType)
: base (channelType)
{
}
public WebChannelFactory (string configurationName)
: base (configurationName)
public WebChannelFactory (string endpointConfigurationName)
: base (endpointConfigurationName)
{
}

View File

@@ -68,15 +68,15 @@ namespace System.ServiceModel.Web
OutgoingWebRequestContext outgoing_request;
OutgoingWebResponseContext outgoing_response;
public WebOperationContext (OperationContext operation)
public WebOperationContext (OperationContext operationContext)
{
if (operation == null)
throw new ArgumentNullException ("operation");
if (operationContext == null)
throw new ArgumentNullException ("operationContext");
outgoing_request = new OutgoingWebRequestContext ();
incoming_response = new IncomingWebResponseContext (operation);
incoming_response = new IncomingWebResponseContext (operationContext);
#if !MOBILE
incoming_request = new IncomingWebRequestContext (operation);
incoming_request = new IncomingWebRequestContext (operationContext);
outgoing_response = new OutgoingWebResponseContext ();
#endif
}
@@ -101,12 +101,12 @@ namespace System.ServiceModel.Web
}
#endif
public void Attach (OperationContext context)
public void Attach (OperationContext owner)
{
// do nothing
}
public void Detach (OperationContext context)
public void Detach (OperationContext owner)
{
// do nothing
}