Merge pull request #2771 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs

@@ -41,35 +41,9 @@ internal abstract class DataContract
 
 #if NET_NATIVE
         // this the global dictionary for data contracts introduced for multi-file.
-        private static Func<Dictionary<Type, DataContract>> s_dataContractsInitializer;
-        private static Lazy<Dictionary<Type, DataContract>> s_dataContracts = new Lazy<Dictionary<Type, DataContract>>(InitDataContracts);
+        private static Dictionary<Type, DataContract> s_dataContracts = new Dictionary<Type, DataContract>();
 
-        public static Func<Dictionary<Type, DataContract>> DataContractsInitializer
-        {
-            get
-            {
-                return s_dataContractsInitializer;
-            }
-            set
-            {
-                Fx.Assert(s_dataContractsInitializer == null, "s_dataContractsInitializer is already initialized.");
-                s_dataContractsInitializer = value;
-            }
-        }
-
-        private static Dictionary<Type, DataContract> InitDataContracts()
-        {
-            if (DataContractsInitializer != null)
-            {
-                return DataContractsInitializer();
-            }
-            else
-            {
-                return new Dictionary<Type, DataContract>();
-            }
-        }
-
-        public static Lazy<Dictionary<Type, DataContract>> GetDataContracts()
+        public static Dictionary<Type, DataContract> GetDataContracts()
         {
             return s_dataContracts;
         }
@@ -101,7 +75,7 @@ private static DataContract GetGeneratedDataContract(Type type)
             // this method used to be rewritten by an IL transfrom
             // with the restructuring for multi-file, it has become a regular method
             DataContract result;
-            return s_dataContracts.Value.TryGetValue(type, out result) ? result : null;
+            return s_dataContracts.TryGetValue(type, out result) ? result : null;
         }
 
         internal static bool TryGetDataContractFromGeneratedAssembly(Type type, out DataContract dataContract)

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonDataContract.cs

@@ -348,37 +348,11 @@ internal class JsonReadWriteDelegates
 #endif
     {
         // this is the global dictionary for JSON delegates introduced for multi-file
-        private static Func<Dictionary<DataContract, JsonReadWriteDelegates>> s_jsonDelegatesInitializer;
-        private static Lazy<Dictionary<DataContract, JsonReadWriteDelegates>> s_jsonDelegates = new Lazy<Dictionary<DataContract, JsonReadWriteDelegates>>(InitJsonDelegates);
+        private static Dictionary<DataContract, JsonReadWriteDelegates> s_jsonDelegates = new Dictionary<DataContract, JsonReadWriteDelegates>();
 
-        public static Func<Dictionary<DataContract, JsonReadWriteDelegates>> JsonDelegatesInitializer
+        public static Dictionary<DataContract, JsonReadWriteDelegates> GetJsonDelegates()
         {
-            get
-            {
-                return s_jsonDelegatesInitializer;
-            }
-            set
-            {
-                Fx.Assert(s_jsonDelegatesInitializer == null, "s_jsonDelegatesInitializer is already initialized.");
-                s_jsonDelegatesInitializer = value;
-            }
-        }
-
-        private static Dictionary<DataContract, JsonReadWriteDelegates> InitJsonDelegates()
-        {
-            if (JsonDelegatesInitializer != null)
-            {
-                return JsonDelegatesInitializer();
-            }
-            else
-            {
-                return new Dictionary<DataContract, JsonReadWriteDelegates>();
-            }
-        }
-
-        internal static Dictionary<DataContract, JsonReadWriteDelegates> GetJsonDelegates()
-        {
-            return s_jsonDelegates.Value;
+            return s_jsonDelegates;
         }
 
         public JsonFormatClassWriterDelegate ClassWriterDelegate { get; set; }