Imported Upstream version 5.10.0.132

Former-commit-id: a9e918d5dd4e43efde300d26074ebd475b9927ef
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-22 09:08:32 +00:00
parent 65dc56118c
commit 4373cb63d5
45 changed files with 120 additions and 49 deletions

View File

@ -122,8 +122,10 @@ namespace Xamarin.ApiDiff {
{
bool a = false;
foreach (var item in elements) {
var memberDescription = $"{State.Namespace}.{State.Type}: Added {GroupName}: {GetDescription (item)}";
State.LogDebugMessage ($"Possible -a value: {memberDescription}");
SetContext (item);
if (State.IgnoreAdded.Any (re => re.IsMatch (GetDescription (item))))
if (State.IgnoreAdded.Any (re => re.IsMatch (memberDescription)))
continue;
if (!a) {
BeforeAdding (elements);
@ -159,7 +161,9 @@ namespace Xamarin.ApiDiff {
{
bool r = false;
foreach (var item in elements) {
if (State.IgnoreRemoved.Any (re => re.IsMatch (GetDescription (item))))
var memberDescription = $"{State.Namespace}.{State.Type}: Removed {GroupName}: {GetDescription (item)}";
State.LogDebugMessage ($"Possible -r value: {memberDescription}");
if (State.IgnoreRemoved.Any (re => re.IsMatch (memberDescription)))
continue;
SetContext (item);
if (State.IgnoreNonbreaking && !IsBreakingRemoval (item))
@ -597,7 +601,7 @@ namespace Xamarin.ApiDiff {
if (srcObsolete == null) {
if (tgtObsolete == null)
return; // neither is obsolete
var change = new ApiChange ();
var change = new ApiChange (GetDescription (source));
change.Header = "Obsoleted " + GroupName;
change.Append (string.Format ("<span class='obsolete obsolete-{0}' data-is-non-breaking>", ElementName));
change.Append ("[Obsolete (");