Merge in 'release/2.0.0' changes

dotnet · Feb 12, 2018 · e612053 · e612053
2 parents 3e1de6c + d96927a
commit e612053
Showing 1 changed file with 18 additions and 7 deletions.
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,19 +172,29 @@ 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");
-                if (!File.Exists(serializerPath))
-                {
-                    serializerPath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), serializerName + ".dll");
-                }
+
+                string serializerPath = null;
 
                 try
                 {
-                    serializer = Assembly.LoadFile(serializerPath);
+                    if (!string.IsNullOrEmpty(type.Assembly.Location))
+                    {
+                        serializerPath = Path.Combine(Path.GetDirectoryName(type.Assembly.Location), serializerName + ".dll");
+                    }
+
+                    if ((string.IsNullOrEmpty(serializerPath) || !File.Exists(serializerPath)) && !string.IsNullOrEmpty(Assembly.GetEntryAssembly().Location))
+                    {
+                        serializerPath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), serializerName + ".dll");
+                    }
+
+                    if (!string.IsNullOrEmpty(serializerPath))
+                    {
+                        serializer = Assembly.LoadFile(serializerPath);
+                    }
                 }
                 catch (Exception e)
                 {
-                    if (e is OutOfMemoryException)
+                    if (e is StackOverflowException || e is OutOfMemoryException)
                     {
                         throw;
                     }
@@ -195,6 +205,7 @@ internal static Assembly LoadGeneratedAssembly(Type type, string defaultNamespac
                         return null;
                     }
                 }
+
                 if (serializer == null)
                 {
                     return null;