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

Merge changes from TFS

Author: stephentoub

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

@@ -41,9 +41,35 @@ internal abstract class DataContract
 
 #if NET_NATIVE
         // this the global dictionary for data contracts introduced for multi-file.
-        private static Dictionary<Type, DataContract> s_dataContracts = new Dictionary<Type, DataContract>();
+        private static Func<Dictionary<Type, DataContract>> s_dataContractsInitializer;
+        private static Lazy<Dictionary<Type, DataContract>> s_dataContracts = new Lazy<Dictionary<Type, DataContract>>(InitDataContracts);
 
-        public static Dictionary<Type, DataContract> GetDataContracts()
+        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()
         {
             return s_dataContracts;
         }
@@ -75,7 +101,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.TryGetValue(type, out result) ? result : null;
+            return s_dataContracts.Value.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

@@ -341,11 +341,37 @@ internal class JsonReadWriteDelegates
 #endif
     {
         // this is the global dictionary for JSON delegates introduced for multi-file
-        private static Dictionary<DataContract, JsonReadWriteDelegates> s_jsonDelegates = new Dictionary<DataContract, JsonReadWriteDelegates>();
+        private static Func<Dictionary<DataContract, JsonReadWriteDelegates>> s_jsonDelegatesInitializer;
+        private static Lazy<Dictionary<DataContract, JsonReadWriteDelegates>> s_jsonDelegates = new Lazy<Dictionary<DataContract, JsonReadWriteDelegates>>(InitJsonDelegates);
 
-        public static Dictionary<DataContract, JsonReadWriteDelegates> GetJsonDelegates()
+        public static Func<Dictionary<DataContract, JsonReadWriteDelegates>> JsonDelegatesInitializer
         {
-            return s_jsonDelegates;
+            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;
         }
 
         public JsonFormatClassWriterDelegate ClassWriterDelegate { get; set; }