Allow deserialization for ResourceManager created with non-default resource set type...

Commit migrated from https://github.com/dotnet/coreclr/commit/d74fa42f811dbe28a8c12ae39122f8d110fbfa5c

diff --git a/src/libraries/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs b/src/libraries/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs
index f2ef9dd..485417d 100644 (file)
--- a/src/libraries/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Resources/ManifestBasedResourceGroveler.cs
@@ -237,10 +237,23 @@ namespace System.Resources
                     }
                     else
                     {
-                        Type readerType = Type.GetType(readerTypeName, throwOnError: true);
-                        object[] args = new object[1];
-                        args[0] = store;
-                        IResourceReader reader = (IResourceReader)Activator.CreateInstance(readerType, args);
+                        IResourceReader reader;
+
+                        // Permit deserialization as long as the default ResourceReader is used
+                        if (ResourceManager.IsDefaultType(readerTypeName, ResourceManager.ResReaderTypeName))
+                        {
+                            reader = new ResourceReader(
+                                store,
+                                new Dictionary<string, ResourceLocator>(FastResourceComparer.Default),
+                                permitDeserialization: true);
+                        }
+                        else
+                        {
+                            Type readerType = Type.GetType(readerTypeName, throwOnError: true);
+                            object[] args = new object[1];
+                            args[0] = store;
+                            reader = (IResourceReader)Activator.CreateInstance(readerType, args);
+                        }
 
                         object[] resourceSetArgs = new object[1];
                         resourceSetArgs[0] = reader;