Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -54,7 +54,7 @@ namespace System.ServiceModel.Dispatcher
{
contract_name = name;
contract_ns = ns;
#if !NET_2_1
#if !MOBILE
CallbackDispatchRuntime = (DispatchRuntime) callbackDispatchRuntime ?? new DispatchRuntime (null, this);
#endif
}
@@ -80,7 +80,7 @@ namespace System.ServiceModel.Dispatcher
public Type ContractClientType { get; set; }
#if !NET_2_1
#if !MOBILE
public DispatchRuntime CallbackDispatchRuntime { get; internal set; }
#endif
@@ -88,7 +88,7 @@ namespace System.ServiceModel.Dispatcher
get { return inspectors; }
}
#if NET_2_1
#if MOBILE
public KeyedCollection<string,ClientOperation> Operations {
get { return operations; }
}