Skip to content

[Generator] Remove method that is already present in the reflection API. #17524

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
mandel-macaque merged 2 commits into from
Feb 14, 2023
Merged

[Generator] Remove method that is already present in the reflection API. #17524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5df7f23
[Generator] Remove method that is already represent in the reflection…
mandel-macaque Feb 13, 2023
4bf99a2
Auto-format source code
Feb 13, 2023
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
8 changes: 2 additions & 6 deletions src/bgen/AttributeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ IEnumerable<T> CreateAttributeInstance<T> (CustomAttributeData attribute, ICusto
return convertedAttributes.OfType<T> ();

var expectedType = ConvertTypeToMeta (typeof (T), provider);
if (attribute.GetAttributeType () != expectedType && !IsSubclassOf (expectedType, attribute.GetAttributeType ()))
if (attribute.GetAttributeType () != expectedType && !attribute.GetAttributeType ().IsSubclassOf (expectedType))
return Enumerable.Empty<T> ();

System.Type attribType = ConvertTypeFromMeta (attribute.GetAttributeType (), provider);
Expand Down Expand Up @@ -538,7 +538,7 @@ public bool HasAttribute<T> (ICustomAttributeProvider provider) where T : Attrib
var attrib = attribs [i];
if (attrib.GetAttributeType () == attribute_type)
return true;
if (IsSubclassOf (attribute_type, attrib.GetAttributeType ()))
if (attrib.GetAttributeType ().IsSubclassOf (attribute_type))
return true;
}

Expand Down Expand Up @@ -580,10 +580,6 @@ public static ICustomAttributeProvider GetReturnTypeCustomAttributes (MethodInfo
return method.ReturnParameter;
}

static bool IsSubclassOf (Type base_class, Type derived_class)
{
return derived_class.IsSubclassOf (base_class);
}
}

public static class AttributeConversionManager {
Expand Down
2 changes: 1 addition & 1 deletion tests/monotouch-test/CoreBluetooth/CentralManagerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void SetUp ()
{
if (TestRuntime.IsInCI && TestRuntime.CheckXcodeVersion (14, 0))
TestRuntime.AssertNotDesktop (); // Looks like this particular test doesn't like Desktop + M1 bot machines
// iOS 13 and friends require bluetooth permission
// iOS 13 and friends require bluetooth permission

@mandel-macaque mandel-macaque Feb 13, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rolfbjarne ein?

@rolfbjarne rolfbjarne Feb 13, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was added here: #17349, and autoformat disabled, so the change shows up in the next PR (yours)

if (TestRuntime.CheckXcodeVersion (11, 0))
TestRuntime.CheckBluetoothPermission (true);
//known UUID for a heart monitor, more common, we want to find something and make sure we do not crash
Expand Down