Merge f5fc478 into df1251e

Author: mike-eee

src/ExtendedXmlSerializer/ReflectionModel/AssemblyLoader.cs

@@ -1,18 +1,24 @@
-using System.Collections.Immutable;
+using System;
+using System.Collections.Immutable;
 using System.IO;
 using System.Reflection;
 
 namespace ExtendedXmlSerializer.ReflectionModel
 {
 	sealed class AssemblyLoader : IAssemblyLoader
 	{
-		readonly ImmutableArray<Assembly> _loaded;
 		public static AssemblyLoader Default { get; } = new AssemblyLoader();
 
-		AssemblyLoader() : this(AssemblyProvider.Default.Get()
-		                                        .ToImmutableArray()) {}
+		AssemblyLoader() : this(AssemblyPath.Default.Get, AssemblyProvider.Default.Get().ToImmutableArray()) {}
 
-		AssemblyLoader(ImmutableArray<Assembly> loaded) => _loaded = loaded;
+		AssemblyLoader(Func<string, string> path, ImmutableArray<Assembly> loaded)
+		{
+			_path   = path;
+			_loaded = loaded;
+		}
+
+		readonly Func<string, string>     _path;
+		readonly ImmutableArray<Assembly> _loaded;
 
 		public Assembly Get(string parameter)
 		{
@@ -22,18 +28,25 @@ public Assembly Get(string parameter)
 			}
 			catch (FileNotFoundException)
 			{
-				var length = _loaded.Length;
-				for (var i = 0; i < length; i++)
+				try
 				{
-					var assembly = _loaded[i];
-					if (assembly.GetName()
-					            .Name == parameter)
+					return Assembly.LoadFile(_path(parameter));
+				}
+				catch
+				{
+					var length = _loaded.Length;
+					for (var i = 0; i < length; i++)
 					{
-						return assembly;
+						var assembly = _loaded[i];
+						if (assembly.GetName()
+						            .Name == parameter)
+						{
+							return assembly;
+						}
 					}
-				}
 
-				throw;
+					throw;
+				}
 			}
 		}
 	}

src/ExtendedXmlSerializer/ReflectionModel/AssemblyPath.cs

@@ -0,0 +1,63 @@
+using ExtendedXmlSerializer.Core.Sources;
+using System;
+using System.Runtime.InteropServices;
+
+namespace ExtendedXmlSerializer.ReflectionModel
+{
+	/// <summary>
+	/// Attribution: https://stackoverflow.com/a/6131116/10340424
+	/// </summary>
+	sealed class AssemblyPath : IParameterizedSource<string, string>
+	{
+		public static AssemblyPath Default { get; } = new AssemblyPath();
+
+		AssemblyPath() {}
+
+		public string Get(string parameter)
+		{
+			if (parameter == null)
+			{
+				throw new ArgumentNullException(nameof(parameter));
+			}
+
+			var finalName = parameter;
+			var aInfo     = new AssemblyInfo {cchBuf = 1024}; // should be fine...
+			aInfo.currentAssemblyPath = new string('\0', aInfo.cchBuf);
+
+			var hr = CreateAssemblyCache(out var ac, 0);
+			if (hr >= 0)
+			{
+				hr = ac.QueryAssemblyInfo(0, finalName, ref aInfo);
+				if (hr < 0)
+				{
+					return null;
+				}
+			}
+
+			return aInfo.currentAssemblyPath;
+		}
+
+		[DllImport("fusion.dll")]
+		static extern int CreateAssemblyCache(out IAssemblyCache ppAsmCache, int reserved);
+
+		[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("e707dcde-d1cd-11d2-bab9-00c04f8eceae")]
+		interface IAssemblyCache
+		{
+			void Reserved0();
+
+			[PreserveSig]
+			int QueryAssemblyInfo(int flags, [MarshalAs(UnmanagedType.LPWStr)] string assemblyName,
+			                      ref AssemblyInfo assemblyInfo);
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		struct AssemblyInfo
+		{
+			readonly                                 int    cbAssemblyInfo;
+			readonly                                 int    assemblyFlags;
+			readonly                                 long   assemblySizeInKB;
+			[MarshalAs(UnmanagedType.LPWStr)] public string currentAssemblyPath;
+			public                                   int    cchBuf; // size of path buf.
+		}
+	}
+}

test/ExtendedXmlSerializer.Tests.ReportedIssues/ExtendedXmlSerializer.Tests.ReportedIssues.csproj

@@ -29,18 +29,6 @@
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">
-    <Reference Include="WindowsBase" />
-    <Reference Include="System.Data">
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' != 'net471' ">
     <ProjectReference Include="..\..\src\ExtendedXmlSerializer\ExtendedXmlSerializer.csproj" />
   </ItemGroup>

test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue366Tests.cs

@@ -0,0 +1,37 @@
+using ExtendedXmlSerializer.Configuration;
+using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
+using FluentAssertions;
+using System.Drawing;
+using Xunit;
+
+namespace ExtendedXmlSerializer.Tests.ReportedIssues
+{
+	public sealed class Issue366Tests
+	{
+		[Fact]
+		void Verify()
+		{
+			var instance = new Model();
+			new ConfigurationContainer().Create()
+			                            .ForTesting()
+			                            .Cycle(instance)
+			                            .Should()
+			                            .BeEquivalentTo(instance);
+		}
+
+		public class Model
+		{
+			public Model()
+			{
+				NestedModel = new NestedModel();
+			}
+
+			public NestedModel NestedModel { get; set; }
+		}
+
+		public class NestedModel
+		{
+			public Size Size { get; set; }
+		}
+	}
+}