Obsolete UnmodifiableDictionary

Author: hazzik

src/NHibernate/Event/EventListeners.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using NHibernate.Cfg;
 using NHibernate.Event.Default;
 using NHibernate.Util;
@@ -53,7 +54,7 @@ static EventListeners()
 			eventInterfaceFromType[ListenerType.PostCollectionRecreate] = typeof (IPostCollectionRecreateEventListener);
 			eventInterfaceFromType[ListenerType.PostCollectionRemove] = typeof (IPostCollectionRemoveEventListener);
 			eventInterfaceFromType[ListenerType.PostCollectionUpdate] = typeof (IPostCollectionUpdateEventListener);
-			eventInterfaceFromType = new UnmodifiableDictionary<ListenerType, System.Type>(eventInterfaceFromType);
+			eventInterfaceFromType = new ReadOnlyDictionary<ListenerType, System.Type>(eventInterfaceFromType);
 		}
 
 		private ILoadEventListener[] loadEventListeners = new ILoadEventListener[] {new DefaultLoadEventListener()};

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Data.Common;
 using System.Linq;
 using System.Runtime.Serialization;
@@ -263,7 +264,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 					implementorToEntityName[model.MappedClass] = model.EntityName;
 				}
 			}
-			classMetadata = new UnmodifiableDictionary<string, IClassMetadata>(classMeta);
+			classMetadata = new ReadOnlyDictionary<string, IClassMetadata>(classMeta);
 
 			Dictionary<string, ISet<string>> tmpEntityToCollectionRoleMap = new Dictionary<string, ISet<string>>();
 			collectionPersisters = new Dictionary<string, ICollectionPersister>();
@@ -308,8 +309,8 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 			{
 				tmpcollectionMetadata.Add(collectionPersister.Key, collectionPersister.Value.CollectionMetadata);
 			}
-			collectionMetadata = new UnmodifiableDictionary<string, ICollectionMetadata>(tmpcollectionMetadata);
-			collectionRolesByEntityParticipant = new UnmodifiableDictionary<string, ISet<string>>(tmpEntityToCollectionRoleMap);
+			collectionMetadata = new ReadOnlyDictionary<string, ICollectionMetadata>(tmpcollectionMetadata);
+			collectionRolesByEntityParticipant = new ReadOnlyDictionary<string, ISet<string>>(tmpEntityToCollectionRoleMap);
 			#endregion
 
 			#region Named Queries

src/NHibernate/Mapping/PersistentClass.cs

@@ -4,6 +4,7 @@
 using NHibernate.SqlCommand;
 using NHibernate.Util;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace NHibernate.Mapping
@@ -560,7 +561,7 @@ public virtual IDictionary<EntityMode, string> TuplizerMap
 		{
 			get
 			{
-				return tuplizerImpls == null ? null : new UnmodifiableDictionary<EntityMode, string>(tuplizerImpls);
+				return tuplizerImpls == null ? null : new ReadOnlyDictionary<EntityMode, string>(tuplizerImpls);
 			}
 		}
 

src/NHibernate/Mapping/Subclass.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using NHibernate.Engine;
 using NHibernate.Util;
@@ -189,7 +190,7 @@ public override IDictionary<EntityMode, string> TuplizerMap
 					{
 						ArrayHelper.AddAll(combined, specificTuplizerDefs);
 					}
-					return new UnmodifiableDictionary<EntityMode, string>(combined);
+					return new ReadOnlyDictionary<EntityMode, string>(combined);
 				}
 			}
 		}

src/NHibernate/Util/UnmodifiableDictionary.cs

@@ -13,6 +13,8 @@ namespace NHibernate.Util
 	/// </summary>
 	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
 	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	//Since v5.1
+	[Obsolete("Please use System.Collections.ObjectModel.ReadOnlyDictionary<K,V> instead.")]
 	[Serializable]
 	public class UnmodifiableDictionary<TKey, TValue> : IDictionary<TKey, TValue>
 	{