Merge pull request #539 from oskarb/no_net_4_cond

oskarb · web-flow · commit 9efd3c3ae7b1 · 2016-12-05T09:23:30.000Z
Remove use of NET_4_0 conditional. Leads to slight code simplification.
diff --git a/src/NHibernate/ADOException.cs b/src/NHibernate/ADOException.cs
@@ -56,11 +56,7 @@ protected ADOException(SerializationInfo info, StreamingContext context) : base(
 			this.sql = (string) info.GetValue("sql", typeof(string));
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -72,4 +68,4 @@ public string SqlString
 			get { return sql; }
 		}
 	}
-}
+}
diff --git a/src/NHibernate/AdoNet/ConnectionManager.cs b/src/NHibernate/AdoNet/ConnectionManager.cs
@@ -282,11 +282,7 @@ private ConnectionManager(SerializationInfo info, StreamingContext context)
 			interceptor = (IInterceptor)info.GetValue("interceptor", typeof(IInterceptor));
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			info.AddValue("ownConnection", ownConnection);
diff --git a/src/NHibernate/AdoNet/TooManyRowsAffectedException.cs b/src/NHibernate/AdoNet/TooManyRowsAffectedException.cs
@@ -25,11 +25,7 @@ protected TooManyRowsAffectedException(SerializationInfo info, StreamingContext
 			this.actualRowCount = info.GetInt32("actualRowCount");
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -47,4 +43,4 @@ public int ActualRowCount
 			get { return actualRowCount; }
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Cfg/Configuration.cs b/src/NHibernate/Cfg/Configuration.cs
@@ -121,9 +121,7 @@ private T GetSerialedObject<T>(SerializationInfo info, string name)
 			return (T)info.GetValue(name, typeof(T));
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#endif
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			ConfigureProxyFactoryFactory();
diff --git a/src/NHibernate/Engine/CascadeStyle.cs b/src/NHibernate/Engine/CascadeStyle.cs
@@ -93,9 +93,7 @@ public static CascadeStyle GetCascadeStyle(string cascade)
 				return style;
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#endif
 		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			string alias = AliasByStyle[this];
@@ -108,9 +106,7 @@ private sealed class CascadeStyleSingletonReference : IObjectReference, ISeriali
 		{
 			private readonly string _cascadeStyle;
 
-#if NET_4_0
 			[SecurityCritical]
-#endif
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
 				throw new NotImplementedException("This class should not be serialized directly.");
@@ -270,9 +266,7 @@ private MultipleCascadeStyle(SerializationInfo info, StreamingContext context)
 				styles = (CascadeStyle[])info.GetValue("styles", typeof(CascadeStyle[]));
 			}
 
-#if NET_4_0
 			[SecurityCritical]
-#endif
 			void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 			{
 				info.AddValue("styles", styles);
diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs
@@ -1495,11 +1495,7 @@ internal StatefulPersistenceContext(SerializationInfo info, StreamingContext con
 			InitTransientState();
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			log.Debug("serializing persistent-context");
diff --git a/src/NHibernate/Impl/SessionFactoryImpl.cs b/src/NHibernate/Impl/SessionFactoryImpl.cs
@@ -423,9 +423,7 @@ public EventListeners EventListeners
 
 		#region IObjectReference Members
 
-#if NET_4_0
 		[SecurityCritical]
-#endif
 		public object GetRealObject(StreamingContext context)
 		{
 			// the SessionFactory that was serialized only has values in the properties
diff --git a/src/NHibernate/Impl/SessionImpl.cs b/src/NHibernate/Impl/SessionImpl.cs
@@ -133,11 +133,7 @@ private SessionImpl(SerializationInfo info, StreamingContext context)
 		/// has complete control and what is serialized and those attributes are ignored.  However,
 		/// this method should be in sync with the attributes for easy readability.
 		/// </remarks>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			log.Debug("writting session to serializer");
diff --git a/src/NHibernate/InstantiationException.cs b/src/NHibernate/InstantiationException.cs
@@ -90,11 +90,7 @@ protected InstantiationException(SerializationInfo info, StreamingContext contex
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -103,4 +99,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/InvalidProxyTypeException.cs b/src/NHibernate/InvalidProxyTypeException.cs
@@ -42,11 +42,7 @@ public InvalidProxyTypeException(SerializationInfo info, StreamingContext contex
 			Errors = (ICollection<string>)info.GetValue("errors", typeof(ICollection));
 		}
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -55,4 +51,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/NonUniqueObjectException.cs b/src/NHibernate/NonUniqueObjectException.cs
@@ -79,11 +79,7 @@ protected NonUniqueObjectException(SerializationInfo info, StreamingContext cont
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -93,4 +89,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/PropertyAccessException.cs b/src/NHibernate/PropertyAccessException.cs
@@ -99,11 +99,7 @@ protected PropertyAccessException(SerializationInfo info, StreamingContext conte
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
diff --git a/src/NHibernate/PropertyValueException.cs b/src/NHibernate/PropertyValueException.cs
@@ -84,11 +84,7 @@ protected PropertyValueException(SerializationInfo info, StreamingContext contex
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -98,4 +94,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Proxy/DynamicProxy/ProxyObjectReference.cs b/src/NHibernate/Proxy/DynamicProxy/ProxyObjectReference.cs
@@ -48,9 +48,7 @@ protected ProxyObjectReference(SerializationInfo info, StreamingContext context)
 
 		#region IObjectReference Members
 
-#if NET_4_0
 		[SecurityCritical]
-#endif
 		public object GetRealObject(StreamingContext context)
 		{
 			return _proxy;
@@ -60,11 +58,9 @@ public object GetRealObject(StreamingContext context)
 
 		#region ISerializable Members
 
-#if NET_4_0
 		[SecurityCritical]
-#endif
 		public void GetObjectData(SerializationInfo info, StreamingContext context) {}
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/QueryException.cs b/src/NHibernate/QueryException.cs
@@ -113,11 +113,7 @@ protected QueryException(SerializationInfo info, StreamingContext context) : bas
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -126,4 +122,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/StaleObjectStateException.cs b/src/NHibernate/StaleObjectStateException.cs
@@ -87,11 +87,7 @@ protected StaleObjectStateException(SerializationInfo info, StreamingContext con
 		/// <param name="context">
 		/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
 		/// </param>
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -101,4 +97,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/UnresolvableObjectException.cs b/src/NHibernate/UnresolvableObjectException.cs
@@ -92,11 +92,7 @@ public static void ThrowIfNull(object o, object id, string entityName)
 
 		#region ISerializable Members
 
-#if NET_4_0
 		[SecurityCritical]
-#else
-		[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
-#endif
 		public override void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			base.GetObjectData(info, context);
@@ -115,4 +111,4 @@ protected UnresolvableObjectException(SerializationInfo info, StreamingContext c
 
 		#endregion
 	}
-}
+}
diff --git a/src/NHibernate/Util/IdentitySet.cs b/src/NHibernate/Util/IdentitySet.cs
diff --git a/src/NHibernate/WrongClassException.cs b/src/NHibernate/WrongClassException.cs

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,7 @@ protected ADOException(SerializationInfo info, StreamingContext context) : base(`
`56`	`56`	`this.sql = (string) info.GetValue("sql", typeof(string));`
`57`	`57`	`}`
`58`	`58`
`59`		`-#if NET_4_0`
`60`	`59`	`[SecurityCritical]`
`61`		`-#else`
`62`		`- [SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]`
`63`		`-#endif`
`64`	`60`	`public override void GetObjectData(SerializationInfo info, StreamingContext context)`
`65`	`61`	`{`
`66`	`62`	`base.GetObjectData(info, context);`
`@@ -72,4 +68,4 @@ public string SqlString`
`72`	`68`	`get { return sql; }`
`73`	`69`	`}`
`74`	`70`	`}`
`75`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -282,11 +282,7 @@ private ConnectionManager(SerializationInfo info, StreamingContext context)`
`282`	`282`	`interceptor = (IInterceptor)info.GetValue("interceptor", typeof(IInterceptor));`
`283`	`283`	`}`
`284`	`284`
`285`		`-#if NET_4_0`
`286`	`285`	`[SecurityCritical]`
`287`		`-#else`
`288`		`- [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]`
`289`		`-#endif`
`290`	`286`	`public void GetObjectData(SerializationInfo info, StreamingContext context)`
`291`	`287`	`{`
`292`	`288`	`info.AddValue("ownConnection", ownConnection);`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,7 @@ protected TooManyRowsAffectedException(SerializationInfo info, StreamingContext`
`25`	`25`	`this.actualRowCount = info.GetInt32("actualRowCount");`
`26`	`26`	`}`
`27`	`27`
`28`		`-#if NET_4_0`
`29`	`28`	`[SecurityCritical]`
`30`		`-#else`
`31`		`- [SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]`
`32`		`-#endif`
`33`	`29`	`public override void GetObjectData(SerializationInfo info, StreamingContext context)`
`34`	`30`	`{`
`35`	`31`	`base.GetObjectData(info, context);`
`@@ -47,4 +43,4 @@ public int ActualRowCount`
`47`	`43`	`get { return actualRowCount; }`
`48`	`44`	`}`
`49`	`45`	`}`
`50`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,7 @@ private T GetSerialedObject<T>(SerializationInfo info, string name)`
`121`	`121`	`return (T)info.GetValue(name, typeof(T));`
`122`	`122`	`}`
`123`	`123`
`124`		`-#if NET_4_0`
`125`	`124`	`[SecurityCritical]`
`126`		`-#endif`
`127`	`125`	`public void GetObjectData(SerializationInfo info, StreamingContext context)`
`128`	`126`	`{`
`129`	`127`	`ConfigureProxyFactoryFactory();`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,7 @@ public static CascadeStyle GetCascadeStyle(string cascade)`
`93`	`93`	`return style;`
`94`	`94`	`}`
`95`	`95`
`96`		`-#if NET_4_0`
`97`	`96`	`[SecurityCritical]`
`98`		`-#endif`
`99`	`97`	`void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)`
`100`	`98`	`{`
`101`	`99`	`string alias = AliasByStyle[this];`
`@@ -108,9 +106,7 @@ private sealed class CascadeStyleSingletonReference : IObjectReference, ISeriali`
`108`	`106`	`{`
`109`	`107`	`private readonly string _cascadeStyle;`
`110`	`108`
`111`		`-#if NET_4_0`
`112`	`109`	`[SecurityCritical]`
`113`		`-#endif`
`114`	`110`	`void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)`
`115`	`111`	`{`
`116`	`112`	`throw new NotImplementedException("This class should not be serialized directly.");`
`@@ -270,9 +266,7 @@ private MultipleCascadeStyle(SerializationInfo info, StreamingContext context)`
`270`	`266`	`styles = (CascadeStyle[])info.GetValue("styles", typeof(CascadeStyle[]));`
`271`	`267`	`}`
`272`	`268`
`273`		`-#if NET_4_0`
`274`	`269`	`[SecurityCritical]`
`275`		`-#endif`
`276`	`270`	`void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)`
`277`	`271`	`{`
`278`	`272`	`info.AddValue("styles", styles);`
Original file line number	Diff line number	Diff line change
`@@ -1495,11 +1495,7 @@ internal StatefulPersistenceContext(SerializationInfo info, StreamingContext con`
`1495`	`1495`	`InitTransientState();`
`1496`	`1496`	`}`
`1497`	`1497`
`1498`		`-#if NET_4_0`
`1499`	`1498`	`[SecurityCritical]`
`1500`		`-#else`
`1501`		`- [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]`
`1502`		`-#endif`
`1503`	`1499`	`void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)`
`1504`	`1500`	`{`
`1505`	`1501`	`log.Debug("serializing persistent-context");`
Original file line number	Diff line number	Diff line change
`@@ -423,9 +423,7 @@ public EventListeners EventListeners`
`423`	`423`
`424`	`424`	`#region IObjectReference Members`
`425`	`425`
`426`		`-#if NET_4_0`
`427`	`426`	`[SecurityCritical]`
`428`		`-#endif`
`429`	`427`	`public object GetRealObject(StreamingContext context)`
`430`	`428`	`{`
`431`	`429`	`// the SessionFactory that was serialized only has values in the properties`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,7 @@ public InvalidProxyTypeException(SerializationInfo info, StreamingContext contex`
`42`	`42`	`Errors = (ICollection<string>)info.GetValue("errors", typeof(ICollection));`
`43`	`43`	`}`
`44`	`44`
`45`		`-#if NET_4_0`
`46`	`45`	`[SecurityCritical]`
`47`		`-#else`
`48`		`- [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]`
`49`		`-#endif`
`50`	`46`	`public override void GetObjectData(SerializationInfo info, StreamingContext context)`
`51`	`47`	`{`
`52`	`48`	`base.GetObjectData(info, context);`
`@@ -55,4 +51,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont`
`55`	`51`
`56`	`52`	`#endregion`
`57`	`53`	`}`
`58`		`-}`
	`54`	`+}`