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

@ -45,9 +45,9 @@ namespace System.Web.Configuration
properties = new ConfigurationPropertyCollection();
}
public void Add (AssemblyInfo info)
public void Add (AssemblyInfo assemblyInformation)
{
BaseAdd (info, false);
BaseAdd (assemblyInformation, false);
}
public void Clear ()

View File

@ -74,8 +74,8 @@ namespace System.Web.Configuration {
set { if (BaseGet(index) != null) BaseRemoveAt(index); BaseAdd(index, value); }
}
public new BufferModeSettings this [string name] {
get { return (BufferModeSettings) BaseGet (name); }
public new BufferModeSettings this [string key] {
get { return (BufferModeSettings) BaseGet (key); }
}
protected internal override ConfigurationPropertyCollection Properties {

View File

@ -99,8 +99,8 @@ namespace System.Web.Configuration {
set { if (BaseGet (index) != null) BaseRemoveAt (index); BaseAdd (index, value); }
}
public new EventMappingSettings this [string name] {
get { return (EventMappingSettings) BaseGet (name); }
public new EventMappingSettings this [string key] {
get { return (EventMappingSettings) BaseGet (key); }
}
protected internal override ConfigurationPropertyCollection Properties {

View File

@ -48,9 +48,9 @@ namespace System.Web.Configuration
{
}
public void Add (HttpModuleAction httpModuleAction)
public void Add (HttpModuleAction httpModule)
{
BaseAdd (httpModuleAction);
BaseAdd (httpModule);
}
public void Clear ()

View File

@ -94,8 +94,8 @@ namespace System.Web.Configuration {
BaseRemoveAt (index);
}
public new ProfileSettings this [string name] {
get { return (ProfileSettings)BaseGet (name); }
public new ProfileSettings this [string key] {
get { return (ProfileSettings)BaseGet (key); }
}
public ProfileSettings this [int index] {

View File

@ -51,9 +51,9 @@ namespace System.Web.Configuration
groupSettings = new ProfileGroupSettingsCollection ();
}
public override bool Equals (object obj)
public override bool Equals (object rootProfilePropertySettingsCollection)
{
RootProfilePropertySettingsCollection col = obj as RootProfilePropertySettingsCollection;
RootProfilePropertySettingsCollection col = rootProfilePropertySettingsCollection as RootProfilePropertySettingsCollection;
if (col == null)
return false;

View File

@ -94,8 +94,8 @@ namespace System.Web.Configuration {
BaseRemoveAt (index);
}
public new RuleSettings this [string name] {
get { return (RuleSettings) BaseGet (name); }
public new RuleSettings this [string key] {
get { return (RuleSettings) BaseGet (key); }
}
public RuleSettings this [int index] {

View File

@ -69,9 +69,9 @@ namespace System.Web.Configuration
this.MappedTagType = mappedTagTypeName;
}
public override bool Equals (object map)
public override bool Equals (object o)
{
TagMapInfo info = map as TagMapInfo;
TagMapInfo info = o as TagMapInfo;
if (info == null)
return false;

View File

@ -99,8 +99,8 @@ namespace System.Web.Configuration {
get { return "trustLevel"; }
}
public new TrustLevel this [string name] {
get { return (TrustLevel) BaseGet (name); }
public new TrustLevel this [string key] {
get { return (TrustLevel) BaseGet (key); }
}
public TrustLevel this [int index] {