Merge branch 'master' into type-level-polymorphism-attr

Author: yfakariya

build/Version.txt

@@ -1 +1 @@
-0.8.0-beta
+0.9.0-dev

src/CommonAssemblyInfo.cs

@@ -35,13 +35,13 @@
 //   Major : Represents Major update like re-architecting, remove obsoleted APIs etc.
 //   Minor : Represents Minor update like adding new feature, obsoleting APIs, fix specification issues, etc.
 //   Build/Revision : Always 0 since CLI implementations does not care these number, so these changes cause some binding failures.
-[assembly: AssemblyVersion( "0.7.0.0" )]
+[assembly: AssemblyVersion( "0.9.0.0" )]
 
 // This version represents libarary 'version' for human beings.
 //   Major : Same as AssemblyVersion.
 //   Minor : Same as AssemblyVersion.
 //   Build : Bug fixes and improvements, which does not break API contract, but may break some code depends on internal implementation behaviors.
 //           For example, some programs use reflection to retrieve private fields, analyse human readable exception messages or stack trace, or so.
 //   Revision : Reserced. It might be used to indicate target platform or patch.
-[assembly: AssemblyInformationalVersion( "0.7.0-alpha2" )]
+[assembly: AssemblyInformationalVersion( "0.9.0-dev" )]
 

src/MsgPack/Serialization/SerializationTarget.cs

@@ -50,6 +50,12 @@ namespace MsgPack.Serialization
 	/// </summary>
 	internal class SerializationTarget
 	{
+		// Type names to avoid user who doesn't embed "message pack assembly's attributes" in their code directly.
+		private static readonly string MessagePackMemberAttributeTypeName = typeof( MessagePackMemberAttribute ).FullName;
+		private static readonly string MessagePackIgnoreAttributeTypeName = typeof( MessagePackIgnoreAttribute ).FullName;
+		private static readonly string MessagePackDeserializationConstructorAttributeTypeName = typeof( MessagePackDeserializationConstructorAttribute ).FullName;
+
+
 		public IList<SerializingMember> Members { get; private set; }
 		public ConstructorInfo DeserializationConstructor { get; private set; }
 		public bool IsConstructorDeserialization
@@ -177,7 +183,7 @@ private static IEnumerable<SerializingMember> GetTargetMembers( Type type )
 			Contract.Assert( type != null, "type != null" );
 
 			var members = GetDistinctMembers( type );
-			var filtered = members.Where( item => item.IsDefined( typeof( MessagePackMemberAttribute ) ) ).ToArray();
+			var filtered = members.Where( item => item.GetCustomAttributesData().Any( a => a.GetAttributeType().FullName == MessagePackMemberAttributeTypeName ) ).ToArray();
 
 			if ( filtered.Length > 0 )
 			{
@@ -197,7 +203,7 @@ private static IEnumerable<SerializingMember> GetAnnotatedMembersWithDuplication
 		{
 			var duplicated =
 				filtered.FirstOrDefault(
-					member => member.IsDefined( typeof( MessagePackIgnoreAttribute ) )
+					member => member.GetCustomAttributesData().Any( a => a.GetAttributeType().FullName == MessagePackIgnoreAttributeTypeName )
 				);
 
 			if ( duplicated != null )
@@ -357,7 +363,7 @@ private static ConstructorInfo FindDeserializationConstructor( Type targetType )
 
 		private static IList<ConstructorInfo> FindExplicitDeserializationConstructors( IEnumerable<ConstructorInfo> construtors )
 		{
-			return construtors.Where( ctor => ctor.IsDefined( typeof( MessagePackDeserializationConstructorAttribute ) ) ).ToArray();
+			return construtors.Where( ctor => ctor.GetCustomAttributesData().Any( a => a.GetAttributeType().FullName == MessagePackDeserializationConstructorAttributeTypeName ) ).ToArray();
 		}
 
 		private static SerializationException NewTypeCannotBeSerializedException( Type targetType )