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

@ -287,13 +287,13 @@ namespace System.Web.UI.WebControls
return o.ToString ();
}
public static PropertyDescriptor GetValidationProperty (object o)
public static PropertyDescriptor GetValidationProperty (object component)
{
PropertyDescriptorCollection props;
System.ComponentModel.AttributeCollection col;
props = TypeDescriptor.GetProperties (o);
col = TypeDescriptor.GetAttributes (o);
props = TypeDescriptor.GetProperties (component);
col = TypeDescriptor.GetAttributes (component);
foreach (Attribute at in col) {
ValidationPropertyAttribute vpa = at as ValidationPropertyAttribute;