diff options
Diffstat (limited to 'csharp/src/Google.Protobuf')
3 files changed, 72 insertions, 9 deletions
diff --git a/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs b/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs index 934424f8..8a6fefa7 100644 --- a/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs +++ b/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs @@ -34,16 +34,31 @@ using System.Reflection; namespace Google.Protobuf.Compatibility { + /// <summary> + /// Extension methods for <see cref="PropertyInfo"/>, effectively providing + /// the familiar members from previous desktop framework versions while + /// targeting the newer releases, .NET Core etc. + /// </summary> internal static class PropertyInfoExtensions { + /// <summary> + /// Returns the public getter of a property, or null if there is no such getter + /// (either because it's read-only, or the getter isn't public). + /// </summary> internal static MethodInfo GetGetMethod(this PropertyInfo target) { - return target.GetMethod; + var method = target.GetMethod; + return method != null && method.IsPublic ? method : null; } + /// <summary> + /// Returns the public setter of a property, or null if there is no such setter + /// (either because it's write-only, or the setter isn't public). + /// </summary> internal static MethodInfo GetSetMethod(this PropertyInfo target) { - return target.SetMethod; + var method = target.SetMethod; + return method != null && method.IsPublic ? method : null; } } } diff --git a/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs b/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs index fbfb47fa..762a29eb 100644 --- a/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs +++ b/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs @@ -38,28 +38,76 @@ namespace Google.Protobuf.Compatibility /// <summary> /// Provides extension methods on Type that just proxy to TypeInfo. /// These are used to support the new type system from .NET 4.5, without - /// having calls to GetTypeInfo all over the place. + /// having calls to GetTypeInfo all over the place. While the methods here are meant to be + /// broadly compatible with the desktop framework, there are some subtle differences in behaviour - but + /// they're not expected to affect our use cases. While the class is internal, that should be fine: we can + /// evaluate each new use appropriately. /// </summary> internal static class TypeExtensions { + /// <summary> + /// Returns true if the target type is a value type, including a nullable value type or an enum, or false + /// if it's a reference type (class, delegate, interface - including System.ValueType and System.Enum). + /// </summary> internal static bool IsValueType(this Type target) { return target.GetTypeInfo().IsValueType; } + /// <summary> + /// See https://msdn.microsoft.com/en-us/library/system.type.isassignablefrom + /// </summary> internal static bool IsAssignableFrom(this Type target, Type c) { return target.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo()); } + /// <summary> + /// Returns a representation of the public property associated with the given name in the given type, + /// including inherited properties or null if there is no such public property. + /// Here, "public property" means a property where either the getter, or the setter, or both, is public. + /// </summary> internal static PropertyInfo GetProperty(this Type target, string name) { - return target.GetTypeInfo().GetDeclaredProperty(name); + // GetDeclaredProperty only returns properties declared in the given type, so we need to recurse. + while (target != null) + { + var typeInfo = target.GetTypeInfo(); + var ret = typeInfo.GetDeclaredProperty(name); + if (ret != null && ((ret.CanRead && ret.GetMethod.IsPublic) || (ret.CanWrite && ret.SetMethod.IsPublic))) + { + return ret; + } + target = typeInfo.BaseType; + } + return null; } + /// <summary> + /// Returns a representation of the public method associated with the given name in the given type, + /// including inherited methods. + /// </summary> + /// <remarks> + /// This has a few differences compared with Type.GetMethod in the desktop framework. It will throw + /// if there is an ambiguous match even between a private method and a public one, but it *won't* throw + /// if there are two overloads at different levels in the type hierarchy (e.g. class Base declares public void Foo(int) and + /// class Child : Base declares public void Foo(long)). + /// </remarks> + /// <exception cref="AmbiguousMatchException">One type in the hierarchy declared more than one method with the same name</exception> internal static MethodInfo GetMethod(this Type target, string name) { - return target.GetTypeInfo().GetDeclaredMethod(name); + // GetDeclaredMethod only returns methods declared in the given type, so we need to recurse. + while (target != null) + { + var typeInfo = target.GetTypeInfo(); + var ret = typeInfo.GetDeclaredMethod(name); + if (ret != null && ret.IsPublic) + { + return ret; + } + target = typeInfo.BaseType; + } + return null; } } } diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec index 9b5e1c83..09ec5cf0 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.nuspec +++ b/csharp/src/Google.Protobuf/Google.Protobuf.nuspec @@ -16,9 +16,9 @@ <tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags> </metadata> <files> - <file src="bin/Release/Google.Protobuf.dll" target="lib/portable-net45+win8+wp8+wpa81" /> - <file src="bin/Release/Google.Protobuf.pdb" target="lib/portable-net45+win8+wp8+wpa81" /> - <file src="bin/Release/Google.Protobuf.xml" target="lib/portable-net45+win8+wp8+wpa81" /> - <file src="**\*.cs" target="src" /> + <file src="bin/Release/Google.Protobuf.dll" target="lib/portable-net45+netcore45+wpa81+wp8" /> + <file src="bin/Release/Google.Protobuf.pdb" target="lib/portable-net45+netcore45+wpa81+wp8" /> + <file src="bin/Release/Google.Protobuf.xml" target="lib/portable-net45+netcore45+wpa81+wp8" /> + <file src="**\*.cs" target="src" /> </files> </package> |