Merge 9a288db into a2fa09b

ExtendedXmlSerializer · Dec 2, 2019 · 0150ddb · 0150ddb
2 parents a2fa09b + 9a288db
commit 0150ddb
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 48 deletions.
diff --git a/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySerializers.cs b/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySerializers.cs
@@ -8,18 +8,15 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 
 namespace ExtendedXmlSerializer.ContentModel.Collections
 {
 	sealed class MappedArraySerializers : IContents
 	{
 		readonly IContents _contents;
 
-		public MappedArraySerializers(IContents contents)
-		{
-			_contents = contents;
-		}
+		public MappedArraySerializers(IContents contents) => _contents = contents;
 
 		public ISerializer Get(TypeInfo parameter)
 		{
@@ -53,25 +50,12 @@ public void Write(IFormatWriter writer, Array instance)
 			}
 		}
 
-		sealed class SizeOf<T> : ISource<int>
+		sealed class SizeOf<T> : DelegatedSource<int>
 		{
 			[UsedImplicitly]
 			public static SizeOf<T> Default { get; } = new SizeOf<T>();
 
-			SizeOf() {}
-
-			public int Get()
-			{
-				var dm = new DynamicMethod("func", typeof(int), Type.EmptyTypes);
-
-				ILGenerator il = dm.GetILGenerator();
-				il.Emit(OpCodes.Sizeof, typeof(T));
-				il.Emit(OpCodes.Ret);
-
-				var factory = (Func<int>)dm.CreateDelegate(typeof(Func<int>));
-				var result  = factory();
-				return result;
-			}
+			SizeOf() : base(Unsafe.SizeOf<T>) {}
 		}
 
 		sealed class Sizes : StructureCache<TypeInfo, int>

diff --git a/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySpecification.cs b/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySpecification.cs
@@ -1,23 +1,20 @@
-using System.Reflection;
-using ExtendedXmlSerializer.Core.Specifications;
-using ExtendedXmlSerializer.ReflectionModel;
-
-namespace ExtendedXmlSerializer.ContentModel.Collections
-{
-	sealed class MappedArraySpecification : ISpecification<TypeInfo>
-	{
-		public static MappedArraySpecification Default { get; } = new MappedArraySpecification();
-
-		readonly ISpecification<TypeInfo> _specification;
-
-		public MappedArraySpecification() : this(IsValueTypeSpecification.Default) {}
-
-		public MappedArraySpecification(ISpecification<TypeInfo> specification)
-		{
-			_specification = specification;
-		}
-
-		public bool IsSatisfiedBy(TypeInfo parameter) => parameter.GetArrayRank() > 1 &&
-		                                                 _specification.IsSatisfiedBy(parameter.GetElementType());
-	}
+using System.Reflection;
+using ExtendedXmlSerializer.Core.Specifications;
+using ExtendedXmlSerializer.ReflectionModel;
+
+namespace ExtendedXmlSerializer.ContentModel.Collections
+{
+	sealed class MappedArraySpecification : ISpecification<TypeInfo>
+	{
+		public static MappedArraySpecification Default { get; } = new MappedArraySpecification();
+
+		readonly ISpecification<TypeInfo> _specification;
+
+		public MappedArraySpecification() : this(IsValueTypeSpecification.Default) {}
+
+		public MappedArraySpecification(ISpecification<TypeInfo> specification) => _specification = specification;
+
+		public bool IsSatisfiedBy(TypeInfo parameter) => parameter.GetArrayRank() > 1 &&
+		                                                 _specification.IsSatisfiedBy(parameter.GetElementType());
+	}
 }
diff --git a/src/ExtendedXmlSerializer/ExtendedXmlSerializer.csproj b/src/ExtendedXmlSerializer/ExtendedXmlSerializer.csproj
@@ -52,11 +52,11 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
     <PackageReference Include="LightInject" Version="6.2.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="NReco.LambdaParser" Version="1.0.10" />
     <PackageReference Include="Sprache" Version="2.2.0" />
     <PackageReference Include="System.Interactive" Version="4.0.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
   </ItemGroup>
 </Project>
diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Xml/DefaultMemberOrder.cs b/src/ExtendedXmlSerializer/ExtensionModel/Xml/DefaultMemberOrder.cs
@@ -1,9 +1,11 @@
 using ExtendedXmlSerializer.Core.Sources;
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Xml.Serialization;
 
 namespace ExtendedXmlSerializer.ExtensionModel.Xml
-{
+{
 	/// <summary>
 	/// Default order selector that looks for a <see cref="XmlElementAttribute.Order"/> and if not specified, uses the <see cref="MemberInfo.MetadataToken"/>.
 	/// </summary>
@@ -14,10 +16,32 @@ public sealed class DefaultMemberOrder : IParameterizedSource<MemberInfo, int>
 		/// </summary>
 		public static DefaultMemberOrder Default { get; } = new DefaultMemberOrder();
 
-		DefaultMemberOrder() {}
+		DefaultMemberOrder() : this(DefaultXmlElementAttribute.Default.Get, Members.Default.Get) {}
+
+		readonly Func<MemberInfo, XmlElementAttribute> _attribute;
+		readonly Func<MemberInfo, List<MemberInfo>> _members;
+
+		/// <inheritdoc />
+		public DefaultMemberOrder(Func<MemberInfo, XmlElementAttribute> attribute,
+		                          Func<MemberInfo, List<MemberInfo>> members)
+		{
+			_attribute = attribute;
+			_members = members;
+		}
 
 		/// <inheritdoc />
-		public int Get(MemberInfo parameter)
-			=> DefaultXmlElementAttribute.Default.Get(parameter)?.Order ?? parameter.MetadataToken;
+		public int Get(MemberInfo parameter) => _attribute(parameter)?.Order ?? Resolve(parameter);
+
+		int Resolve(MemberInfo parameter)
+		{
+			try
+			{
+				return parameter.MetadataToken;
+			}
+			catch (InvalidOperationException) // UWP Throws, because UWP: https://github.com/ExtendedXmlSerializer/home/issues/269#issuecomment-559485714
+			{
+				return _members(parameter).IndexOf(parameter);
+			}
+		}
 	}
 }
diff --git a/src/ExtendedXmlSerializer/ExtensionModel/Xml/Members.cs b/src/ExtendedXmlSerializer/ExtensionModel/Xml/Members.cs
@@ -0,0 +1,17 @@
+using ExtendedXmlSerializer.Core.Sources;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace ExtendedXmlSerializer.ExtensionModel.Xml
+{
+	sealed class Members : ReferenceCache<Type, List<MemberInfo>>, IParameterizedSource<MemberInfo, List<MemberInfo>>
+	{
+		public static Members Default { get; } = new Members();
+
+		Members() : base(x => x.GetMembers().ToList()) {}
+
+		public List<MemberInfo> Get(MemberInfo parameter) => base.Get(parameter.ReflectedType);
+	}
+}