mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.ServiceModel/Dummy_2_1.cs
View File

@@ -35,7 +35,7 @@ namespace System.ServiceModel
get { throw new NotImplementedException (); }
}
IExtensionCollection<InstanceContext> IExtensibleObject<InstanceContext>.Extensions
public IExtensionCollection<InstanceContext> Extensions
{
get { throw new NotImplementedException (); }
}

2
mcs/class/System.ServiceModel/Dummy_XM_4_5.cs
View File

@@ -22,7 +22,7 @@ namespace System.ServiceModel
get { throw new NotImplementedException (); }
}
IExtensionCollection<InstanceContext> IExtensibleObject<InstanceContext>.Extensions
public IExtensionCollection<InstanceContext> Extensions
{
get { throw new NotImplementedException (); }
}

8
mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs
View File

@@ -65,14 +65,14 @@ namespace System.Collections.Generic
return list;
}
protected override void InsertItem (int index, TItem kind)
protected override void InsertItem (int index, TItem item)
{
base.InsertItem (index, kind);
base.InsertItem (index, item);
}
protected override void SetItem (int index, TItem kind)
protected override void SetItem (int index, TItem item)
{
base.SetItem (index, kind);
base.SetItem (index, item);
}
public T Remove<T> ()

4
mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs
View File

@@ -57,10 +57,10 @@ namespace System.Collections.Generic
}
protected SynchronizedKeyedCollection (object syncRoot,
IEqualityComparer<K> comparer, int capacity)
IEqualityComparer<K> comparer, int dictionaryCreationThreshold)
: base (syncRoot)
{
dict = new Dictionary<K, T> (capacity, comparer);
dict = new Dictionary<K, T> (dictionaryCreationThreshold, comparer);
}
// see bug #76417

16
mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs
View File

@@ -43,25 +43,25 @@ namespace System.Collections.Generic
{
}
public SynchronizedReadOnlyCollection (object sync_root)
: this (sync_root, new List<T> ())
public SynchronizedReadOnlyCollection (object syncRoot)
: this (syncRoot, new List<T> ())
{
}
public SynchronizedReadOnlyCollection (object sync_root, IEnumerable<T> list)
public SynchronizedReadOnlyCollection (object syncRoot, IEnumerable<T> list)
{
if (sync_root == null)
throw new ArgumentNullException ("sync_root");
if (syncRoot == null)
throw new ArgumentNullException ("syncRoot");
if (list == null)
throw new ArgumentNullException ("list");
this.sync_root = sync_root;
this.sync_root = syncRoot;
this.l = new List<T> (list);
}
public SynchronizedReadOnlyCollection (object sync_root, params T [] list)
: this (sync_root, (IEnumerable<T>) list)
public SynchronizedReadOnlyCollection (object syncRoot, params T [] list)
: this (syncRoot, (IEnumerable<T>) list)
{
}

8
mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs
View File

@@ -176,7 +176,7 @@ namespace System.ServiceModel.Channels
public virtual IChannelListener<TChannel>
BuildChannelListener<TChannel> (
Uri listenUri,
Uri listenUriBaseAddress,
params object [] parameters)
where TChannel : class, IChannel
{
@@ -184,16 +184,16 @@ namespace System.ServiceModel.Channels
new BindingParameterCollection ();
foreach (object o in parameters)
pl.Add (o);
return BuildChannelListener<TChannel> (listenUri, pl);
return BuildChannelListener<TChannel> (listenUriBaseAddress, pl);
}
public virtual IChannelListener<TChannel>
BuildChannelListener<TChannel> (
Uri listenUri,
Uri listenUriBaseAddress,
BindingParameterCollection parameters)
where TChannel : class, IChannel
{
return BuildChannelListener<TChannel> (listenUri,
return BuildChannelListener<TChannel> (listenUriBaseAddress,
String.Empty, parameters);
}

10
mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs
View File

@@ -197,16 +197,16 @@ namespace System.ServiceModel.Channels
}
public IAsyncResult BeginAcceptChannel (
AsyncCallback callback, object asyncState)
AsyncCallback callback, object state)
{
return BeginAcceptChannel (
timeouts.ReceiveTimeout, callback, asyncState);
timeouts.ReceiveTimeout, callback, state);
}
public IAsyncResult BeginAcceptChannel (TimeSpan timeout,
AsyncCallback callback, object asyncState)
AsyncCallback callback, object state)
{
return OnBeginAcceptChannel (timeout, callback, asyncState);
return OnBeginAcceptChannel (timeout, callback, state);
}
public TChannel EndAcceptChannel (IAsyncResult result)
@@ -217,7 +217,7 @@ namespace System.ServiceModel.Channels
protected abstract TChannel OnAcceptChannel (TimeSpan timeout);
protected abstract IAsyncResult OnBeginAcceptChannel (TimeSpan timeout,
AsyncCallback callback, object asyncState);
AsyncCallback callback, object state);
protected abstract TChannel OnEndAcceptChannel (IAsyncResult result);
}

4
mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
View File

@@ -43,8 +43,8 @@ namespace System.ServiceModel.Channels
ISecurityCapabilities security;
string scheme = "";
public CustomBinding (string name)
: this (name, default_ns)
public CustomBinding (string configurationName)
: this (configurationName, default_ns)
{
}

8
mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs
View File

@@ -334,19 +334,19 @@ namespace System.ServiceModel.Channels
// 1)
public static Message CreateMessage (MessageVersion version,
FaultCode code, string reason, string action)
FaultCode faultCode, string reason, string action)
{
MessageFault fault = MessageFault.CreateFault (code, reason);
MessageFault fault = MessageFault.CreateFault (faultCode, reason);
return CreateMessage (version, fault, action);
}
// 2)
public static Message CreateMessage (MessageVersion version,
FaultCode code, string reason, object detail,
FaultCode faultCode, string reason, object detail,
string action)
{
MessageFault fault = MessageFault.CreateFault (
code, new FaultReason (reason), detail);
faultCode, new FaultReason (reason), detail);
return CreateMessage (version, fault, action);
}

8
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs
View File

@@ -47,9 +47,9 @@ namespace System.ServiceModel.Channels {
return CreateNavigator (XmlSpace.Default);
}
public XPathNavigator CreateNavigator (int node_quota)
public XPathNavigator CreateNavigator (int nodeQuota)
{
return CreateNavigator (node_quota, XmlSpace.Default);
return CreateNavigator (nodeQuota, XmlSpace.Default);
}
[MonoTODO ("supply proper quota")]
@@ -60,10 +60,10 @@ namespace System.ServiceModel.Channels {
}
[MonoTODO ("Handle node_quota and xmlspace")]
public XPathNavigator CreateNavigator (int node_quota, XmlSpace space)
public XPathNavigator CreateNavigator (int nodeQuota, XmlSpace space)
{
if (nav_cache == null) {
DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), node_quota);
DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), nodeQuota);
XmlDictionaryWriter w = XmlDictionaryWriter.CreateDictionaryWriter (pw);
CreateMessage ().WriteMessage (w);
nav_cache = pw.CreateDocument ().CreateNavigator ();

12
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
View File

@@ -220,26 +220,26 @@ namespace System.ServiceModel.Channels
public static MessageFault CreateFault (FaultCode code,
FaultReason reason, object detail,
XmlObjectSerializer formatter)
XmlObjectSerializer serializer)
{
return new SimpleMessageFault (code, reason, true,
detail, formatter, String.Empty, String.Empty);
detail, serializer, String.Empty, String.Empty);
}
public static MessageFault CreateFault (FaultCode code,
FaultReason reason, object detail,
XmlObjectSerializer formatter, string actor)
XmlObjectSerializer serializer, string actor)
{
return new SimpleMessageFault (code, reason,
true, detail, formatter, actor, String.Empty);
true, detail, serializer, actor, String.Empty);
}
public static MessageFault CreateFault (FaultCode code,
FaultReason reason, object detail,
XmlObjectSerializer formatter, string actor, string node)
XmlObjectSerializer serializer, string actor, string node)
{
return new SimpleMessageFault (code, reason,
true, detail, formatter, actor, node);
true, detail, serializer, actor, node);
}
// pretty simple implementation class

10
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
View File

@@ -50,10 +50,10 @@ namespace System.ServiceModel.Channels
new Dictionary<Type, XmlObjectSerializer> ();
MessageVersion version;
public MessageHeaders (MessageHeaders headers)
: this (headers.MessageVersion)
public MessageHeaders (MessageHeaders collection)
: this (collection.MessageVersion)
{
CopyHeadersFrom (headers);
CopyHeadersFrom (collection);
}
public MessageHeaders (MessageVersion version)
@@ -61,10 +61,10 @@ namespace System.ServiceModel.Channels
{
}
public MessageHeaders (MessageVersion version, int capacity)
public MessageHeaders (MessageVersion version, int initialSize)
{
this.version = version;
l = new List<MessageHeaderInfo> (capacity);
l = new List<MessageHeaderInfo> (initialSize);
}
public void Add (MessageHeader header)

6
mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs
View File

@@ -49,10 +49,10 @@ namespace System.ServiceModel.Channels
}
public MtomMessageEncodingBindingElement (
MessageVersion version, Encoding encoding)
MessageVersion messageVersion, Encoding writeEncoding)
{
this.version = version;
this.encoding = encoding;
this.version = messageVersion;
this.encoding = writeEncoding;
}
public int MaxBufferSize {

6
mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs
View File

@@ -41,10 +41,10 @@ namespace System.ServiceModel.Channels
}
protected NamedPipeTransportBindingElement (
NamedPipeTransportBindingElement other)
: base (other)
NamedPipeTransportBindingElement elementToBeCloned)
: base (elementToBeCloned)
{
pool.CopyPropertiesFrom (other.pool);
pool.CopyPropertiesFrom (elementToBeCloned.pool);
}
NamedPipeConnectionPoolSettings pool = new NamedPipeConnectionPoolSettings ();

2
mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs
View File

@@ -37,7 +37,7 @@ namespace System.ServiceModel.Channels
{
}
protected StreamUpgradeBindingElement (StreamUpgradeBindingElement other)
protected StreamUpgradeBindingElement (StreamUpgradeBindingElement elementToBeCloned)
{
}

4
mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
View File

@@ -45,9 +45,9 @@ namespace System.ServiceModel.Channels
{
}
public TransactionFlowBindingElement (TransactionProtocol protocol)
public TransactionFlowBindingElement (TransactionProtocol transactionProtocol)
{
this.protocol = protocol;
this.protocol = transactionProtocol;
}
public TransactionProtocol TransactionProtocol {

12
mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs
View File

@@ -40,14 +40,14 @@ namespace System.ServiceModel.Channels
{
headers = new List<MessageHeaderInfo> ();
}
public void Add (MessageHeaderInfo header)
public void Add (MessageHeaderInfo headerInfo)
{
headers.Add (header);
headers.Add (headerInfo);
}
public bool Contains (MessageHeaderInfo header)
public bool Contains (MessageHeaderInfo headerInfo)
{
return headers.Contains (header);
return headers.Contains (headerInfo);
}
public IEnumerator<MessageHeaderInfo> GetEnumerator ()
@@ -55,9 +55,9 @@ namespace System.ServiceModel.Channels
return headers.GetEnumerator ();
}
public void Remove (MessageHeaderInfo header)
public void Remove (MessageHeaderInfo headerInfo)
{
headers.Remove (header);
headers.Remove (headerInfo);
}
IEnumerator IEnumerable.GetEnumerator ()

12
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs
View File

@@ -111,9 +111,9 @@ namespace System.ServiceModel.Configuration
return new BinaryMessageEncodingBindingElement ();
}
public override void ApplyConfiguration (BindingElement element)
public override void ApplyConfiguration (BindingElement bindingElement)
{
var b = (BinaryMessageEncodingBindingElement) element;
var b = (BinaryMessageEncodingBindingElement) bindingElement;
b.MaxReadPoolSize = MaxReadPoolSize;
b.MaxSessionSize = MaxSessionSize;
b.MaxWritePoolSize = MaxWritePoolSize;
@@ -121,9 +121,9 @@ namespace System.ServiceModel.Configuration
ReaderQuotas.ApplyConfiguration (b.ReaderQuotas);
}
public override void CopyFrom (ServiceModelExtensionElement element)
public override void CopyFrom (ServiceModelExtensionElement from)
{
var b = (BinaryMessageEncodingElement) element;
var b = (BinaryMessageEncodingElement) from;
MaxReadPoolSize = b.MaxReadPoolSize;
MaxSessionSize = b.MaxSessionSize;
MaxWritePoolSize = b.MaxWritePoolSize;
@@ -131,9 +131,9 @@ namespace System.ServiceModel.Configuration
ReaderQuotas.CopyFrom (b.ReaderQuotas);
}
protected internal override void InitializeFrom (BindingElement element)
protected internal override void InitializeFrom (BindingElement bindingElement)
{
var b = (BinaryMessageEncodingBindingElement) element;
var b = (BinaryMessageEncodingBindingElement) bindingElement;
MaxReadPoolSize = b.MaxReadPoolSize;
MaxSessionSize = b.MaxSessionSize;
MaxWritePoolSize = b.MaxWritePoolSize;

6
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs
View File

@@ -165,12 +165,12 @@ namespace System.ServiceModel.Configuration
return sm.Bindings;
}
public new BindingCollectionElement this [string name] {
public new BindingCollectionElement this [string binding] {
get {
object element = base [name];
object element = base [binding];
if (element is BindingCollectionElement)
return (BindingCollectionElement) element;
throw new NotImplementedException (String.Format ("Could not find {0}", name));
throw new NotImplementedException (String.Format ("Could not find {0}", binding));
}
}

32
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
View File

@@ -147,21 +147,21 @@ namespace System.ServiceModel.Configuration
return cb;
}
protected internal void ApplyConfiguration (ClientCredentials cb)
protected internal void ApplyConfiguration (ClientCredentials behavior)
{
cb.SupportInteractive = SupportInteractive;
behavior.SupportInteractive = SupportInteractive;
// how is "Type" used?
// ClientCertificate
if (!String.IsNullOrEmpty (ClientCertificate.FindValue))
cb.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue);
behavior.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue);
// HttpDigest
if (HttpDigest.ImpersonationLevel != TokenImpersonationLevel.None)
throw new NotImplementedException ();
// IssuedToken
var bi = cb.IssuedToken;
var bi = behavior.IssuedToken;
var ci = IssuedToken;
bi.CacheIssuedTokens = ci.CacheIssuedTokens;
bi.DefaultKeyEntropyMode = ci.DefaultKeyEntropyMode;
@@ -174,19 +174,19 @@ namespace System.ServiceModel.Configuration
// Peer
if (!String.IsNullOrEmpty (Peer.Certificate.FindValue))
cb.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
behavior.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
// cb.Peer.MeshPassword = /* cannot fill it here */
cb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
cb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
cb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
cb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
cb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
cb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
cb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
cb.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
behavior.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
behavior.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
behavior.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
behavior.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
behavior.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
behavior.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
behavior.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
behavior.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
// ServiceCertificate
var bsc = cb.ServiceCertificate;
var bsc = behavior.ServiceCertificate;
var csc = ServiceCertificate;
var bsca = bsc.Authentication;
var csca = csc.Authentication;
@@ -202,8 +202,8 @@ namespace System.ServiceModel.Configuration
// cb.UserNamePassword : not configurable ...
// Windows
cb.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel;
cb.Windows.AllowNtlm = Windows.AllowNtlm;
behavior.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel;
behavior.Windows.AllowNtlm = Windows.AllowNtlm;
}
object CreateInstance (string typeName)

Some files were not shown because too many files have changed in this diff Show More