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

@ -235,10 +235,10 @@ namespace System.Windows.Forms.Design
return false;
}
protected override object GetService (Type service)
protected override object GetService (Type serviceType)
{
if (_serviceProvider != null) {
return _serviceProvider.GetService (service);
return _serviceProvider.GetService (serviceType);
}
return null;
}