PR feedback

diff --git a/src/mscorlib/Resources/Strings.resx b/src/mscorlib/Resources/Strings.resx
index 3bd9cd2..12c6f11 100644 (file)
--- a/src/mscorlib/Resources/Strings.resx
+++ b/src/mscorlib/Resources/Strings.resx
@@ -1274,7 +1274,7 @@
     <value>Cannot use type '{0}'. Only value types without pointers or references are supported.</value>
   </data>
   <data name="Argument_InvalidUnity" xml:space="preserve">
-    <value>Invalid Unity type.</value>
+    <value>Type '{0}' is not deserializable.</value>
   </data>
   <data name="Argument_InvalidValue" xml:space="preserve">
     <value>Value was invalid.</value>

diff --git a/src/mscorlib/shared/System/UnitySerializationHolder.cs b/src/mscorlib/shared/System/UnitySerializationHolder.cs
index 80de8c1..ad83647 100644 (file)
--- a/src/mscorlib/shared/System/UnitySerializationHolder.cs
+++ b/src/mscorlib/shared/System/UnitySerializationHolder.cs
@@ -9,7 +9,7 @@ namespace System
 {
     /// <summary>
     /// Holds Null class for which we guarantee that there is only ever one instance of.
-    /// This only exists for backwarts compatibility with 
+    /// This only exists for compatibility with .NET Framework.
     /// </summary>
 #if CORECLR
     internal
@@ -20,6 +20,7 @@ namespace System
     {
         internal const int NullUnity = 0x0002;
         private readonly int _unityType;
+        private readonly string _data;
 
         /// <summary>
         /// A helper method that returns the SerializationInfo that a class utilizing 
@@ -42,7 +43,9 @@ namespace System
             }
 
             // We are ignoring any other serialization input as we are only concerned about DBNull.
+            // We also store data and use it for erorr logging.
             _unityType = info.GetInt32("UnityType");
+            _data = info.GetString("Data");
         }
 
         public void GetObjectData(SerializationInfo info, StreamingContext context) =>
@@ -53,7 +56,7 @@ namespace System
             // We are only support deserializing DBNull and throwing for everything else.
             if (_unityType != NullUnity)
             {
-                throw new ArgumentException(SR.Argument_InvalidUnity);
+                throw new ArgumentException(SR.Format(SR.Argument_InvalidUnity, _data ?? "UnityType"));
             }
 
             // We are always returning the same DBNull instance.