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

@@ -50,8 +50,8 @@ namespace System.ComponentModel.Design
protected abstract bool ShowCode (IComponent component, EventDescriptor e, string methodName);
protected abstract bool ShowCode (int lineNumber);
protected abstract bool ShowCode ();
protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor eventDescriptor);
protected abstract ICollection GetCompatibleMethods (EventDescriptor eventDescriptor);
protected abstract string CreateUniqueMethodName (IComponent component, EventDescriptor e);
protected abstract ICollection GetCompatibleMethods (EventDescriptor e);
protected virtual void FreeMethod (IComponent component, EventDescriptor e, string methodName)
{
@@ -67,10 +67,10 @@ namespace System.ComponentModel.Design
}
protected object GetService (Type service)
protected object GetService (Type serviceType)
{
if (_provider != null)
return _provider.GetService (service);
return _provider.GetService (serviceType);
return null;
}