Skip to content

[ApiXmlAdjuster] Add additional expected attributes #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Aug 16, 2019
Merged

[ApiXmlAdjuster] Add additional expected attributes #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,15 @@ public static void Load (this JavaPackage package, XmlReader reader, bool isRefe
static readonly string [] expected_type_attributes = new String [] {
"abstract",
"deprecated",
"enclosing-method-jni-type",
"enclosing-method-name",
"enclosing-method-signature",
"final",
"jni-signature",
"name",
"source-file-name",
"static",
"visibility",
"jni-signature",
};

internal static void LoadTypeAttributes (this JavaType type, XmlReader reader, params string [] otherAllowedAttributes)
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static Exception UnexpectedAttribute (XmlReader reader, string elementNam
{
if (reader.NodeType != XmlNodeType.Attribute)
throw new ArgumentException (string.Format ("Internal error: XmlReader should be positioned on attribute, but it is on {0}", reader.NodeType));
return new Exception (string.Format ("{0}: Element '{1}' has an unexpected attribute: '{2}'. Expected attributes are: {2}",
return new Exception (string.Format ("{0}: Element '{1}' has an unexpected attribute: '{2}'. Expected attributes are: {3}",
GetLocation (reader), elementName, reader.LocalName, string.Join (", ", expected)));
}

Expand Down