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

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)

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

@ -150,9 +150,9 @@ namespace System.ServiceModel.Configuration
return new ReliableSessionBindingElement ();
}
public override void ApplyConfiguration (BindingElement element)
public override void ApplyConfiguration (BindingElement bindingElement)
{
var b = (ReliableSessionBindingElement) element;
var b = (ReliableSessionBindingElement) bindingElement;
b.AcknowledgementInterval = AcknowledgementInterval;
b.FlowControlEnabled = FlowControlEnabled;
b.InactivityTimeout = InactivityTimeout;
@ -163,9 +163,9 @@ namespace System.ServiceModel.Configuration
b.ReliableMessagingVersion = ReliableMessagingVersion;
}
public override void CopyFrom (ServiceModelExtensionElement element)
public override void CopyFrom (ServiceModelExtensionElement from)
{
var b = (ReliableSessionElement) element;
var b = (ReliableSessionElement) from;
AcknowledgementInterval = b.AcknowledgementInterval;
FlowControlEnabled = b.FlowControlEnabled;
InactivityTimeout = b.InactivityTimeout;
@ -176,9 +176,9 @@ namespace System.ServiceModel.Configuration
ReliableMessagingVersion = b.ReliableMessagingVersion;
}
protected internal override void InitializeFrom (BindingElement element)
protected internal override void InitializeFrom (BindingElement bindingElement)
{
var b = (ReliableSessionBindingElement) element;
var b = (ReliableSessionBindingElement) bindingElement;
AcknowledgementInterval = b.AcknowledgementInterval;
FlowControlEnabled = b.FlowControlEnabled;
InactivityTimeout = b.InactivityTimeout;

60
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs
View File

@ -132,57 +132,57 @@ namespace System.ServiceModel.Configuration
return sb;
}
protected internal void ApplyConfiguration (ServiceCredentials sb)
protected internal void ApplyConfiguration (ServiceCredentials behavior)
{
// IssuedToken
foreach (AllowedAudienceUriElement ae in IssuedTokenAuthentication.AllowedAudienceUris)
sb.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri);
sb.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers;
sb.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode;
behavior.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri);
behavior.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers;
behavior.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode;
if (!String.IsNullOrEmpty (IssuedTokenAuthentication.CustomCertificateValidatorType))
sb.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType);
sb.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode;
sb.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode;
sb.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation;
behavior.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType);
behavior.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode;
behavior.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode;
behavior.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation;
foreach (X509CertificateTrustedIssuerElement ce in IssuedTokenAuthentication.KnownCertificates)
sb.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue));
behavior.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue));
sb.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType);
behavior.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType);
// Peer
if (!String.IsNullOrEmpty (Peer.Certificate.FindValue))
sb.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);
// sb.Peer.MeshPassword = /* cannot fill it here */
sb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
sb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
sb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
sb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
sb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
sb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
sb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
sb.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;
// WSSC
sb.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType);
behavior.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType);
// X509
if (!String.IsNullOrEmpty (ServiceCertificate.FindValue))
sb.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue);
behavior.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue);
// UserNamePassword
sb.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime;
sb.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens;
sb.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType);
sb.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups;
sb.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens;
sb.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName);
sb.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode;
behavior.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime;
behavior.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens;
behavior.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType);
behavior.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups;
behavior.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens;
behavior.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName);
behavior.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode;
// Windows
sb.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons;
sb.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups;
behavior.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons;
behavior.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups;
}
X509Certificate2 GetCertificate (StoreLocation storeLocation, StoreName storeName, X509FindType findType, object findValue)

16
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs
View File

@ -94,19 +94,19 @@ namespace System.ServiceModel.Configuration
return (ConfigurationElement) Activator.CreateInstance (typeof (ConfigurationElementType), new object [0]);
}
public void CopyTo (ConfigurationElementType [] array, int index)
public void CopyTo (ConfigurationElementType [] array, int start)
{
base.CopyTo (array, index);
base.CopyTo (array, start);
}
public int IndexOf (ConfigurationElementType item)
public int IndexOf (ConfigurationElementType element)
{
return BaseIndexOf (item);
return BaseIndexOf (element);
}
public void Remove (ConfigurationElementType item)
public void Remove (ConfigurationElementType element)
{
BaseRemove (GetElementKey (item));
BaseRemove (GetElementKey (element));
}
public void RemoveAt (int index)
@ -114,9 +114,9 @@ namespace System.ServiceModel.Configuration
BaseRemoveAt (index);
}
public void RemoveAt (object index)
public void RemoveAt (object key)
{
BaseRemove (index);
BaseRemove (key);
}
}
}

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

@ -92,10 +92,10 @@ namespace System.ServiceModel.Configuration
// Methods
public void ApplyConfiguration (OptionalReliableSession s)
public void ApplyConfiguration (OptionalReliableSession optionalReliableSession)
{
base.ApplyConfiguration (s);
s.Enabled = this.Enabled;
base.ApplyConfiguration (optionalReliableSession);
optionalReliableSession.Enabled = this.Enabled;
}
}

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

@ -115,10 +115,10 @@ namespace System.ServiceModel.Configuration
// Methods
public void ApplyConfiguration (ReliableSession s)
public void ApplyConfiguration (ReliableSession reliableSession)
{
s.InactivityTimeout = InactivityTimeout;
s.Ordered = Ordered;
reliableSession.InactivityTimeout = InactivityTimeout;
reliableSession.Ordered = Ordered;
}
}

4
mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs
View File

@ -114,11 +114,11 @@ namespace System.ServiceModel.Configuration
protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ChannelEndpointElement channelEndpointElement);
protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement channelEndpointElement);
protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement serviceEndpointElement);
protected abstract void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement);
protected abstract void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement);
protected abstract void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement);
protected override void Reset (ConfigurationElement parentElement)
{

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

@ -109,12 +109,12 @@ namespace System.ServiceModel.Configuration
return sm.StandardEndpoints;
}
public new EndpointCollectionElement this [string name] {
public new EndpointCollectionElement this [string endpoint] {
get {
object element = base [name];
object element = base [endpoint];
if (element is EndpointCollectionElement)
return (EndpointCollectionElement) element;
throw new ArgumentException (String.Format ("Could not find {0}", name));
throw new ArgumentException (String.Format ("Could not find {0}", endpoint));
}
}

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

@ -124,9 +124,9 @@ namespace System.ServiceModel.Configuration
}
public override void ApplyConfiguration (BindingElement element)
public override void ApplyConfiguration (BindingElement bindingElement)
{
var b = (TextMessageEncodingBindingElement) element;
var b = (TextMessageEncodingBindingElement) bindingElement;
b.MaxReadPoolSize = MaxReadPoolSize;
b.MaxWritePoolSize = MaxWritePoolSize;
b.MessageVersion = MessageVersion;
@ -135,9 +135,9 @@ namespace System.ServiceModel.Configuration
ReaderQuotas.ApplyConfiguration (b.ReaderQuotas);
}
public override void CopyFrom (ServiceModelExtensionElement element)
public override void CopyFrom (ServiceModelExtensionElement from)
{
var b = (TextMessageEncodingElement) element;
var b = (TextMessageEncodingElement) from;
MaxReadPoolSize = b.MaxReadPoolSize;
MaxWritePoolSize = b.MaxWritePoolSize;
MessageVersion = b.MessageVersion;
@ -146,9 +146,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 = (TextMessageEncodingBindingElement) element;
var b = (TextMessageEncodingBindingElement) bindingElement;
MaxReadPoolSize = b.MaxReadPoolSize;
MaxWritePoolSize = b.MaxWritePoolSize;
MessageVersion = b.MessageVersion;