Delete unused leftovers from binary serialization (#15140)

Author: jkotas

src/mscorlib/shared/System/Globalization/DateTimeFormatInfo.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
 
 namespace System.Globalization
 {
@@ -56,24 +55,18 @@ public sealed class DateTimeFormatInfo : IFormatProvider, ICloneable
         private static volatile DateTimeFormatInfo s_invariantInfo;
 
         // an index which points to a record in Culture Data Table.
-        [NonSerialized]
         private CultureData _cultureData;
 
         // The culture name used to create this DTFI.
-
-        [OptionalField(VersionAdded = 2)]
         private String _name = null;
 
         // The language name of the culture used to create this DTFI.
-        [NonSerialized]
         private String _langName = null;
 
         // CompareInfo usually used by the parser.
-        [NonSerialized]
         private CompareInfo _compareInfo = null;
 
         // Culture matches current DTFI. mainly used for string comparisons during parsing.
-        [NonSerialized]
         private CultureInfo _cultureInfo = null;
 
         //
@@ -147,7 +140,6 @@ public sealed class DateTimeFormatInfo : IFormatProvider, ICloneable
         private String longTimePattern = null;
         private String shortTimePattern = null;
 
-        [OptionalField(VersionAdded = 3)]
         private String[] allYearMonthPatterns = null;
 
         private String[] allShortDatePatterns = null;
@@ -347,73 +339,13 @@ private void InitializeOverridableProperties(CultureData cultureData, CalendarId
             Debug.Assert(this.allYearMonthPatterns.Length > 0, "[DateTimeFormatInfo.Populate] Expected some year month patterns");
         }
 
-        [OptionalField(VersionAdded = 1)]
         private bool _useUserOverride;
 
         // This was synthesized by Whidbey so we knew what words might appear in the middle of a date string
         // Now we always synthesize so its not helpful
 
         internal String[] m_dateWords = null;
 
-        [OnSerializing]
-        private void OnSerializing(StreamingContext ctx)
-        {
-            _name = this.CultureName; // make sure the _name is initialized.
-            _useUserOverride = _cultureData.UseUserOverride;
-
-            // Important to initialize these fields otherwise we may run into exception when deserializing on Whidbey
-            // because Whidbey try to initialize some of these fields using calendar data which could be null values 
-            // and then we get exceptions.  So we call the accessors to force the caches to get loaded.
-            Object o;
-            o = this.LongTimePattern;
-            o = this.LongDatePattern;
-            o = this.ShortTimePattern;
-            o = this.ShortDatePattern;
-            o = this.YearMonthPattern;
-            o = this.AllLongTimePatterns;
-            o = this.AllLongDatePatterns;
-            o = this.AllShortTimePatterns;
-            o = this.AllShortDatePatterns;
-            o = this.AllYearMonthPatterns;
-        }
-
-        [OnDeserialized]
-        private void OnDeserialized(StreamingContext ctx)
-        {
-            if (_name != null)
-            {
-                _cultureData = CultureData.GetCultureData(_name, _useUserOverride);
-                if (_cultureData == null)
-                {
-                    throw new CultureNotFoundException("_name", _name, SR.Argument_CultureNotSupported);
-                }
-            }
-
-            if (calendar == null)
-            {
-                calendar = (Calendar)GregorianCalendar.GetDefaultInstance().Clone();
-                calendar.SetReadOnlyState(_isReadOnly);
-            }
-
-            InitializeOverridableProperties(_cultureData, calendar.ID);
-
-            //
-            //  turn off read only state till we finish initializing all fields and then store read only state after we are done.
-            //
-            bool isReadOnly = _isReadOnly;
-            _isReadOnly = false;
-
-            // If we deserialized defaults ala Whidbey, make sure they're still defaults
-            // Whidbey's arrays could get a bit mixed up.
-            if (longDatePattern != null) this.LongDatePattern = longDatePattern;
-            if (shortDatePattern != null) this.ShortDatePattern = shortDatePattern;
-            if (yearMonthPattern != null) this.YearMonthPattern = yearMonthPattern;
-            if (longTimePattern != null) this.LongTimePattern = longTimePattern;
-            if (shortTimePattern != null) this.ShortTimePattern = shortTimePattern;
-
-            _isReadOnly = isReadOnly;
-        }
-
         // Returns a default DateTimeFormatInfo that will be universally
         // supported and constant irrespective of the current culture.
         // Used by FromString methods.
@@ -2094,7 +2026,6 @@ public String[] MonthGenitiveNames
         //
         // Positive TimeSpan Pattern
         //
-        [NonSerialized]
         private string _fullTimeSpanPositivePattern;
         internal String FullTimeSpanPositivePattern
         {
@@ -2118,7 +2049,6 @@ internal String FullTimeSpanPositivePattern
         //
         // Negative TimeSpan Pattern
         //
-        [NonSerialized]
         private string _fullTimeSpanNegativePattern;
         internal String FullTimeSpanNegativePattern
         {
@@ -2269,7 +2199,6 @@ internal Boolean YearMonthAdjustment(ref int year, ref int month, Boolean parsed
         //
         // DateTimeFormatInfo tokenizer.  This is used by DateTime.Parse() to break input string into tokens.
         //
-        [NonSerialized]
         private TokenHashValue[] _dtfiTokenHash;
 
         private const int TOKEN_HASH_SIZE = 199;

src/mscorlib/shared/System/Globalization/NumberFormatInfo.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.Serialization;
 using System.Text;
 
 namespace System.Globalization
@@ -69,7 +68,6 @@ sealed public class NumberFormatInfo : IFormatProvider, ICloneable
         internal String perMilleSymbol = "\u2030";
 
 
-        [OptionalField(VersionAdded = 2)]
         internal String[] nativeDigits = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
         internal int numberDecimalDigits = 2;
@@ -81,29 +79,17 @@ sealed public class NumberFormatInfo : IFormatProvider, ICloneable
         internal int percentNegativePattern = 0;
         internal int percentDecimalDigits = 2;
 
-        [OptionalField(VersionAdded = 2)]
         internal int digitSubstitution = (int)DigitShapes.None;
 
         internal bool isReadOnly = false;
 
         // Is this NumberFormatInfo for invariant culture?
-
-        [OptionalField(VersionAdded = 2)]
         internal bool m_isInvariant = false;
 
         public NumberFormatInfo() : this(null)
         {
         }
 
-        [OnSerializing]
-        private void OnSerializing(StreamingContext ctx) { }
-
-        [OnDeserializing]
-        private void OnDeserializing(StreamingContext ctx) { }
-
-        [OnDeserialized]
-        private void OnDeserialized(StreamingContext ctx) { }
-
         private static void VerifyDecimalSeparator(String decSep, String propertyName)
         {
             if (decSep == null)

src/mscorlib/shared/System/Globalization/SortKey.cs

@@ -13,7 +13,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
 using System.Diagnostics;
 
 namespace System.Globalization
@@ -24,12 +23,8 @@ public partial class SortKey
         //                        Internal Information                        //
         //--------------------------------------------------------------------//
 
-        [OptionalField(VersionAdded = 3)]
         internal string _localeName;       // locale identifier
 
-        [OptionalField(VersionAdded = 1)] // LCID field so serialization is Whidbey compatible though we don't officially support it
-        internal int _win32LCID;
-
         internal CompareOptions _options;  // options
         internal string _string;         // original string
         internal byte[] _keyData;        // sortkey data
@@ -46,26 +41,6 @@ internal SortKey(String localeName, String str, CompareOptions options, byte[] k
             _string = str;
         }
 
-        [OnSerializing]
-        private void OnSerializing(StreamingContext context)
-        {
-            //set LCID to proper value for Whidbey serialization (no other use)
-            if (_win32LCID == 0)
-            {
-                _win32LCID = CultureInfo.GetCultureInfo(_localeName).LCID;
-            }
-        }
-
-        [OnDeserialized]
-        private void OnDeserialized(StreamingContext context)
-        {
-            //set locale name to proper value after Whidbey deserialization
-            if (String.IsNullOrEmpty(_localeName) && _win32LCID != 0)
-            {
-                _localeName = CultureInfo.GetCultureInfo(_win32LCID).Name;
-            }
-        }
-
         ////////////////////////////////////////////////////////////////////////
         //
         //  GetOriginalString

src/mscorlib/shared/System/Globalization/StringInfo.cs

@@ -14,16 +14,13 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 
 namespace System.Globalization
 {
     public class StringInfo
     {
-        [OptionalField(VersionAdded = 2)] 
         private string _str;
 
-        [NonSerialized]
         private int[] _indexes;
 
         // Legacy constructor
@@ -35,21 +32,6 @@ public StringInfo(string value)
             this.String = value;
         }
 
-        [OnDeserializing]
-        private void OnDeserializing(StreamingContext ctx)
-        {
-            _str = String.Empty;
-        }
-
-        [OnDeserialized]
-        private void OnDeserialized(StreamingContext ctx)
-        {
-            if (_str.Length == 0)
-            {
-                _indexes = null;
-            }
-        }
-
         public override bool Equals(Object value)
         {
             StringInfo that = value as StringInfo;

src/mscorlib/shared/System/Lazy.cs

@@ -15,7 +15,6 @@
 using System.Diagnostics;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
 using System.Threading;
 
 namespace System
@@ -191,17 +190,15 @@ private static T CreateViaDefaultConstructor()
             return (T)LazyHelper.CreateViaDefaultConstructor(typeof(T));
         }
 
-        // _state, a volatile reference, is set to null after m_value has been set
-        [NonSerialized]
+        // _state, a volatile reference, is set to null after _value has been set
         private volatile LazyHelper _state;
 
         // we ensure that _factory when finished is set to null to allow garbage collector to clean up
         // any referenced items
-        [NonSerialized]
         private Func<T> _factory;
 
         // _value eventually stores the lazily created value. It is valid when _state = null.
-        private T m_value; // Do not rename (binary serialization)
+        private T _value;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:System.Threading.Lazy{T}"/> class that 
@@ -225,7 +222,7 @@ public Lazy()
         /// </remarks>
         public Lazy(T value)
         {
-            m_value = value;
+            _value = value;
         }
 
         /// <summary>
@@ -311,7 +308,7 @@ private Lazy(Func<T> valueFactory, LazyThreadSafetyMode mode, bool useDefaultCon
 
         private void ViaConstructor()
         {
-            m_value = CreateViaDefaultConstructor();
+            _value = CreateViaDefaultConstructor();
             _state = null; // volatile write, must occur after setting _value
         }
 
@@ -324,7 +321,7 @@ private void ViaFactory(LazyThreadSafetyMode mode)
                     throw new InvalidOperationException(SR.Lazy_Value_RecursiveCallsToValue);
                 _factory = null;
 
-                m_value = factory();
+                _value = factory();
                 _state = null; // volatile write, must occur after setting _value
             }
             catch (Exception exception)
@@ -360,7 +357,7 @@ private void PublicationOnly(LazyHelper publicationOnly, T possibleValue)
             if (previous == publicationOnly)
             {
                 _factory = null;
-                m_value = possibleValue;
+                _value = possibleValue;
                 _state = null; // volatile write, must occur after setting _value
             }
         }
@@ -439,15 +436,6 @@ private T CreateValue()
             return Value;
         }
 
-        /// <summary>Forces initialization during serialization.</summary>
-        /// <param name="context">The StreamingContext for the serialization operation.</param>
-        [OnSerializing]
-        private void OnSerializing(StreamingContext context)
-        {
-            // Force initialization
-            T dummy = Value;
-        }
-
         /// <summary>Creates and returns a string representation of this instance.</summary>
         /// <returns>The result of calling <see cref="System.Object.ToString"/> on the <see
         /// cref="Value"/>.</returns>
@@ -468,7 +456,7 @@ internal T ValueForDebugDisplay
                 {
                     return default(T);
                 }
-                return m_value;
+                return _value;
             }
         }
 
@@ -515,7 +503,7 @@ internal T ValueForDebugDisplay
         /// from initialization delegate.
         /// </remarks>
         [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public T Value => _state == null ? m_value : CreateValue();
+        public T Value => _state == null ? _value : CreateValue();
     }
 
     /// <summary>A debugger view of the Lazy&lt;T&gt; to surface additional debugging properties and 

src/mscorlib/src/System/Collections/ObjectModel/ReadOnlyDictionary.cs

@@ -23,11 +23,8 @@ namespace System.Collections.ObjectModel
     internal class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IDictionary, IReadOnlyDictionary<TKey, TValue>
     {
         private readonly IDictionary<TKey, TValue> m_dictionary;
-        [NonSerialized]
         private Object m_syncRoot;
-        [NonSerialized]
         private KeyCollection m_keys;
-        [NonSerialized]
         private ValueCollection m_values;
 
         public ReadOnlyDictionary(IDictionary<TKey, TValue> dictionary)
@@ -429,7 +426,6 @@ IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values
         public sealed class KeyCollection : ICollection<TKey>, ICollection, IReadOnlyCollection<TKey>
         {
             private readonly ICollection<TKey> m_collection;
-            [NonSerialized]
             private Object m_syncRoot;
 
             internal KeyCollection(ICollection<TKey> collection)
@@ -539,7 +535,6 @@ object ICollection.SyncRoot
         public sealed class ValueCollection : ICollection<TValue>, ICollection, IReadOnlyCollection<TValue>
         {
             private readonly ICollection<TValue> m_collection;
-            [NonSerialized]
             private Object m_syncRoot;
 
             internal ValueCollection(ICollection<TValue> collection)