Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -326,9 +326,19 @@ namespace System.ComponentModel {
return false;
}
if ((mdObj.description == null) != (description == null) ||
(description != null && !mdObj.category.Equals(description))) {
return false;
// VSO 149471 - Technically fixing this could cause a behavior change, so we are
// adding a quirk in case anyone is bit by this and needs the old, buggy behavior.
if (!LocalAppContextSwitches.MemberDescriptorEqualsReturnsFalseIfEquivalent) {
if ((mdObj.description == null) != (description == null) ||
(description != null && !mdObj.description.Equals(description))) {
return false;
}
}
else {
if ((mdObj.description == null) != (description == null) ||
(description != null && !mdObj.category.Equals(description))) {
return false;
}
}
if ((mdObj.attributes == null) != (attributes == null)) {