Load the assembly from the same location as the type assembly (#22558) (#24128)

huanwu · web-flow · commit 653cb2fc7844 · 2017-09-21T16:17:13.000-07:00
diff --git a/src/System.Private.Xml/src/System/Xml/Serialization/Compilation.cs b/src/System.Private.Xml/src/System/Xml/Serialization/Compilation.cs
@@ -172,9 +172,10 @@ internal static Assembly LoadGeneratedAssembly(Type type, string defaultNamespac
                 name.Name = serializerName;
                 name.CodeBase = null;
                 name.CultureInfo = CultureInfo.InvariantCulture;
+                string serializerPath = Path.Combine(Path.GetDirectoryName(type.Assembly.Location), serializerName + ".dll");
                 try
                 {
-                    serializer = Assembly.LoadFile(Path.GetFullPath(serializerName) + ".dll");
+                    serializer = Assembly.LoadFile(serializerPath);
                 }
                 catch (Exception e)
                 {

Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,10 @@ internal static Assembly LoadGeneratedAssembly(Type type, string defaultNamespac`
`172`	`172`	`name.Name = serializerName;`
`173`	`173`	`name.CodeBase = null;`
`174`	`174`	`name.CultureInfo = CultureInfo.InvariantCulture;`
	`175`	`+ string serializerPath = Path.Combine(Path.GetDirectoryName(type.Assembly.Location), serializerName + ".dll");`
`175`	`176`	`try`
`176`	`177`	`{`
`177`		`- serializer = Assembly.LoadFile(Path.GetFullPath(serializerName) + ".dll");`
	`178`	`+ serializer = Assembly.LoadFile(serializerPath);`
`178`	`179`	`}`
`179`	`180`	`catch (Exception e)`
`180`	`181`	`{`