Cross Serialization Cleanup (#21067)

* Remove serialization from namevalucollection types

* Update blobs

Author: ViktorHofer

src/System.Collections.Specialized/src/System/Collections/Specialized/NameObjectCollectionBase.cs

@@ -21,29 +21,15 @@ namespace System.Collections.Specialized
     ///    and <see cref='System.Object' qualify='true'/> values that can be accessed either with the hash code of
     ///    the key or with the index.</para>
     /// </devdoc>
-    [Serializable]
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
     public abstract class NameObjectCollectionBase : ICollection, ISerializable, IDeserializationCallback
     {
-        // const names used for serialization
-        private const String ReadOnlyName = "ReadOnly"; // Do not rename (binary serialization)
-        private const String CountName = "Count"; // Do not rename (binary serialization)
-        private const String ComparerName = "Comparer"; // Do not rename (binary serialization)
-        private const String HashCodeProviderName = "HashProvider"; // Do not rename (binary serialization)
-        private const String KeysName = "Keys"; // Do not rename (binary serialization)
-        private const String ValuesName = "Values"; // Do not rename (binary serialization)
-        private const String KeyComparerName = "KeyComparer"; // Do not rename (binary serialization)
-        private const String VersionName = "Version"; // Do not rename (binary serialization)
-
         private bool _readOnly = false;
         private ArrayList _entriesArray;
         private IEqualityComparer _keyComparer;
         private volatile Hashtable _entriesTable;
         private volatile NameObjectEntry _nullKeyEntry;
         private KeysCollection _keys;
         private int _version;
-        private SerializationInfo _serializationInfo;
-        [NonSerialized]
         private Object _syncRoot;
 
         private static readonly StringComparer s_defaultComparer = CultureInfo.InvariantCulture.CompareInfo.GetStringComparer(CompareOptions.IgnoreCase);
@@ -92,146 +78,17 @@ protected NameObjectCollectionBase(int capacity)
 
         protected NameObjectCollectionBase(SerializationInfo info, StreamingContext context)
         {
-            _serializationInfo = info;
+            throw new PlatformNotSupportedException();
         }
 
         public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
         {
-            if (info == null)
-            {
-                throw new ArgumentNullException(nameof(info));
-            }
-
-            info.AddValue(ReadOnlyName, _readOnly);
-
-            // Maintain backward serialization compatibility if new APIs are not used.
-            if (_keyComparer == s_defaultComparer)
-            {
-                info.AddValue(HashCodeProviderName, CaseInsensitiveHashCodeProvider.DefaultInvariant, typeof(IHashCodeProvider));
-                info.AddValue(ComparerName, CaseInsensitiveComparer.DefaultInvariant, typeof(IComparer));
-            }
-            else if (_keyComparer == null)
-            {
-                info.AddValue(HashCodeProviderName, null, typeof(IHashCodeProvider));
-                info.AddValue(ComparerName, null, typeof(IComparer));
-            }
-            else if (_keyComparer is CompatibleComparer)
-            {
-                CompatibleComparer c = (CompatibleComparer)_keyComparer;
-                info.AddValue(HashCodeProviderName, c.HashCodeProvider, typeof(IHashCodeProvider));
-                info.AddValue(ComparerName, c.Comparer, typeof(IComparer));
-            }
-            else
-            {
-                info.AddValue(KeyComparerName, _keyComparer, typeof(IEqualityComparer));
-            }
-
-            int count = _entriesArray.Count;
-            info.AddValue(CountName, count);
-
-            string[] keys = new string[count];
-            object[] values = new object[count];
-
-            for (int i = 0; i < count; i++)
-            {
-                NameObjectEntry entry = (NameObjectEntry)_entriesArray[i];
-                keys[i] = entry.Key;
-                values[i] = entry.Value;
-            }
-
-            info.AddValue(KeysName, keys, typeof(String[]));
-            info.AddValue(ValuesName, values, typeof(Object[]));
-            info.AddValue(VersionName, _version);
+            throw new PlatformNotSupportedException();
         }
 
         public virtual void OnDeserialization(object sender)
         {
-            if (_keyComparer != null)
-            {
-                //Somebody had a dependency on this and fixed us up before the ObjectManager got to it.
-                return;
-            }
-
-            if (_serializationInfo == null)
-            {
-                throw new SerializationException();
-            }
-
-            SerializationInfo info = _serializationInfo;
-            _serializationInfo = null;
-
-            bool readOnly = false;
-            int count = 0;
-            string[] keys = null;
-            object[] values = null;
-            IHashCodeProvider hashProvider = null;
-            IComparer comparer = null;
-            bool hasVersion = false;
-            int serializedVersion = 0;
-
-            SerializationInfoEnumerator enumerator = info.GetEnumerator();
-            while (enumerator.MoveNext())
-            {
-                switch (enumerator.Name)
-                {
-                    case ReadOnlyName:
-                        readOnly = info.GetBoolean(ReadOnlyName); ;
-                        break;
-                    case HashCodeProviderName:
-                        hashProvider = (IHashCodeProvider)info.GetValue(HashCodeProviderName, typeof(IHashCodeProvider)); ;
-                        break;
-                    case ComparerName:
-                        comparer = (IComparer)info.GetValue(ComparerName, typeof(IComparer));
-                        break;
-                    case KeyComparerName:
-                        _keyComparer = (IEqualityComparer)info.GetValue(KeyComparerName, typeof(IEqualityComparer));
-                        break;
-                    case CountName:
-                        count = info.GetInt32(CountName);
-                        break;
-                    case KeysName:
-                        keys = (String[])info.GetValue(KeysName, typeof(String[]));
-                        break;
-                    case ValuesName:
-                        values = (Object[])info.GetValue(ValuesName, typeof(Object[]));
-                        break;
-                    case VersionName:
-                        hasVersion = true;
-                        serializedVersion = info.GetInt32(VersionName);
-                        break;
-                }
-            }
-
-            if (_keyComparer == null)
-            {
-                if (comparer == null || hashProvider == null)
-                {
-                    throw new SerializationException();
-                }
-                else
-                {
-                    // create a new key comparer for V1 Object    
-                    _keyComparer = new CompatibleComparer(hashProvider, comparer);
-                }
-            }
-
-            if (keys == null || values == null)
-            {
-                throw new SerializationException();
-            }
-
-            Reset(count);
-
-            for (int i = 0; i < count; i++)
-            {
-                BaseAdd(keys[i], values[i]);
-            }
-
-            _readOnly = readOnly;  // after collection populated
-            if (hasVersion)
-            {
-                _version = serializedVersion;
-            }
+            throw new PlatformNotSupportedException();
         }
 
         //

src/System.Collections.Specialized/src/System/Collections/Specialized/NameValueCollection.cs

@@ -17,8 +17,6 @@ namespace System.Collections.Specialized
     /// <para>Represents a sorted collection of associated <see cref='System.String' qualify='true'/> keys and <see cref='System.String' qualify='true'/> values that
     ///    can be accessed either with the hash code of the key or with the index.</para>
     /// </devdoc>
-    [Serializable]
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
     public class NameValueCollection : NameObjectCollectionBase
     {
         private String[] _all; // Do not rename (binary serialization)