Skip to content

Commit 9efd3c3

Browse files
oskarboskarb
authored
Merge pull request #539 from oskarb/no_net_4_cond
Remove use of NET_4_0 conditional. Leads to slight code simplification.
2 parents fe8fcf9 + 8527e5a commit 9efd3c3

19 files changed

+10
-181
lines changed

‎src/NHibernate/ADOException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ protected ADOException(SerializationInfo info, StreamingContext context) : base(
5656
this.sql = (string) info.GetValue("sql", typeof(string));
5757
}
5858

59-
#if NET_4_0
6059
[SecurityCritical]
61-
#else
62-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
63-
#endif
6460
public override void GetObjectData(SerializationInfo info, StreamingContext context)
6561
{
6662
base.GetObjectData(info, context);
@@ -72,4 +68,4 @@ public string SqlString
7268
get { return sql; }
7369
}
7470
}
75-
}
71+
}

‎src/NHibernate/AdoNet/ConnectionManager.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,7 @@ private ConnectionManager(SerializationInfo info, StreamingContext context)
282282
interceptor = (IInterceptor)info.GetValue("interceptor", typeof(IInterceptor));
283283
}
284284

285-
#if NET_4_0
286285
[SecurityCritical]
287-
#else
288-
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
289-
#endif
290286
public void GetObjectData(SerializationInfo info, StreamingContext context)
291287
{
292288
info.AddValue("ownConnection", ownConnection);

‎src/NHibernate/AdoNet/TooManyRowsAffectedException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ protected TooManyRowsAffectedException(SerializationInfo info, StreamingContext
2525
this.actualRowCount = info.GetInt32("actualRowCount");
2626
}
2727

28-
#if NET_4_0
2928
[SecurityCritical]
30-
#else
31-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
32-
#endif
3329
public override void GetObjectData(SerializationInfo info, StreamingContext context)
3430
{
3531
base.GetObjectData(info, context);
@@ -47,4 +43,4 @@ public int ActualRowCount
4743
get { return actualRowCount; }
4844
}
4945
}
50-
}
46+
}

‎src/NHibernate/Cfg/Configuration.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ private T GetSerialedObject<T>(SerializationInfo info, string name)
121121
return (T)info.GetValue(name, typeof(T));
122122
}
123123

124-
#if NET_4_0
125124
[SecurityCritical]
126-
#endif
127125
public void GetObjectData(SerializationInfo info, StreamingContext context)
128126
{
129127
ConfigureProxyFactoryFactory();

‎src/NHibernate/Engine/CascadeStyle.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ public static CascadeStyle GetCascadeStyle(string cascade)
9393
return style;
9494
}
9595

96-
#if NET_4_0
9796
[SecurityCritical]
98-
#endif
9997
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
10098
{
10199
string alias = AliasByStyle[this];
@@ -108,9 +106,7 @@ private sealed class CascadeStyleSingletonReference : IObjectReference, ISeriali
108106
{
109107
private readonly string _cascadeStyle;
110108

111-
#if NET_4_0
112109
[SecurityCritical]
113-
#endif
114110
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
115111
{
116112
throw new NotImplementedException("This class should not be serialized directly.");
@@ -270,9 +266,7 @@ private MultipleCascadeStyle(SerializationInfo info, StreamingContext context)
270266
styles = (CascadeStyle[])info.GetValue("styles", typeof(CascadeStyle[]));
271267
}
272268

273-
#if NET_4_0
274269
[SecurityCritical]
275-
#endif
276270
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
277271
{
278272
info.AddValue("styles", styles);

‎src/NHibernate/Engine/StatefulPersistenceContext.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,11 +1495,7 @@ internal StatefulPersistenceContext(SerializationInfo info, StreamingContext con
14951495
InitTransientState();
14961496
}
14971497

1498-
#if NET_4_0
14991498
[SecurityCritical]
1500-
#else
1501-
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
1502-
#endif
15031499
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
15041500
{
15051501
log.Debug("serializing persistent-context");

‎src/NHibernate/Impl/SessionFactoryImpl.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,7 @@ public EventListeners EventListeners
423423

424424
#region IObjectReference Members
425425

426-
#if NET_4_0
427426
[SecurityCritical]
428-
#endif
429427
public object GetRealObject(StreamingContext context)
430428
{
431429
// the SessionFactory that was serialized only has values in the properties

‎src/NHibernate/Impl/SessionImpl.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,7 @@ private SessionImpl(SerializationInfo info, StreamingContext context)
133133
/// has complete control and what is serialized and those attributes are ignored. However,
134134
/// this method should be in sync with the attributes for easy readability.
135135
/// </remarks>
136-
#if NET_4_0
137136
[SecurityCritical]
138-
#else
139-
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
140-
#endif
141137
void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
142138
{
143139
log.Debug("writting session to serializer");

‎src/NHibernate/InstantiationException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,7 @@ protected InstantiationException(SerializationInfo info, StreamingContext contex
9090
/// <param name="context">
9191
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
9292
/// </param>
93-
#if NET_4_0
9493
[SecurityCritical]
95-
#else
96-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
97-
#endif
9894
public override void GetObjectData(SerializationInfo info, StreamingContext context)
9995
{
10096
base.GetObjectData(info, context);
@@ -103,4 +99,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
10399

104100
#endregion
105101
}
106-
}
102+
}

‎src/NHibernate/InvalidProxyTypeException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public InvalidProxyTypeException(SerializationInfo info, StreamingContext contex
4242
Errors = (ICollection<string>)info.GetValue("errors", typeof(ICollection));
4343
}
4444

45-
#if NET_4_0
4645
[SecurityCritical]
47-
#else
48-
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
49-
#endif
5046
public override void GetObjectData(SerializationInfo info, StreamingContext context)
5147
{
5248
base.GetObjectData(info, context);
@@ -55,4 +51,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
5551

5652
#endregion
5753
}
58-
}
54+
}

‎src/NHibernate/NonUniqueObjectException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,7 @@ protected NonUniqueObjectException(SerializationInfo info, StreamingContext cont
7979
/// <param name="context">
8080
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
8181
/// </param>
82-
#if NET_4_0
8382
[SecurityCritical]
84-
#else
85-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
86-
#endif
8783
public override void GetObjectData(SerializationInfo info, StreamingContext context)
8884
{
8985
base.GetObjectData(info, context);
@@ -93,4 +89,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
9389

9490
#endregion
9591
}
96-
}
92+
}

‎src/NHibernate/PropertyAccessException.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,7 @@ protected PropertyAccessException(SerializationInfo info, StreamingContext conte
9999
/// <param name="context">
100100
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
101101
/// </param>
102-
#if NET_4_0
103102
[SecurityCritical]
104-
#else
105-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
106-
#endif
107103
public override void GetObjectData(SerializationInfo info, StreamingContext context)
108104
{
109105
base.GetObjectData(info, context);

‎src/NHibernate/PropertyValueException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ protected PropertyValueException(SerializationInfo info, StreamingContext contex
8484
/// <param name="context">
8585
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
8686
/// </param>
87-
#if NET_4_0
8887
[SecurityCritical]
89-
#else
90-
[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
91-
#endif
9288
public override void GetObjectData(SerializationInfo info, StreamingContext context)
9389
{
9490
base.GetObjectData(info, context);
@@ -98,4 +94,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
9894

9995
#endregion
10096
}
101-
}
97+
}

‎src/NHibernate/Proxy/DynamicProxy/ProxyObjectReference.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ protected ProxyObjectReference(SerializationInfo info, StreamingContext context)
4848

4949
#region IObjectReference Members
5050

51-
#if NET_4_0
5251
[SecurityCritical]
53-
#endif
5452
public object GetRealObject(StreamingContext context)
5553
{
5654
return _proxy;
@@ -60,11 +58,9 @@ public object GetRealObject(StreamingContext context)
6058

6159
#region ISerializable Members
6260

63-
#if NET_4_0
6461
[SecurityCritical]
65-
#endif
6662
public void GetObjectData(SerializationInfo info, StreamingContext context) {}
6763

6864
#endregion
6965
}
70-
}
66+
}

‎src/NHibernate/QueryException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,7 @@ protected QueryException(SerializationInfo info, StreamingContext context) : bas
113113
/// <param name="context">
114114
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
115115
/// </param>
116-
#if NET_4_0
117116
[SecurityCritical]
118-
#else
119-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
120-
#endif
121117
public override void GetObjectData(SerializationInfo info, StreamingContext context)
122118
{
123119
base.GetObjectData(info, context);
@@ -126,4 +122,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
126122

127123
#endregion
128124
}
129-
}
125+
}

‎src/NHibernate/StaleObjectStateException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ protected StaleObjectStateException(SerializationInfo info, StreamingContext con
8787
/// <param name="context">
8888
/// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
8989
/// </param>
90-
#if NET_4_0
9190
[SecurityCritical]
92-
#else
93-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
94-
#endif
9591
public override void GetObjectData(SerializationInfo info, StreamingContext context)
9692
{
9793
base.GetObjectData(info, context);
@@ -101,4 +97,4 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
10197

10298
#endregion
10399
}
104-
}
100+
}

‎src/NHibernate/UnresolvableObjectException.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ public static void ThrowIfNull(object o, object id, string entityName)
9292

9393
#region ISerializable Members
9494

95-
#if NET_4_0
9695
[SecurityCritical]
97-
#else
98-
[SecurityPermission(SecurityAction.LinkDemand, Flags=SecurityPermissionFlag.SerializationFormatter)]
99-
#endif
10096
public override void GetObjectData(SerializationInfo info, StreamingContext context)
10197
{
10298
base.GetObjectData(info, context);
@@ -115,4 +111,4 @@ protected UnresolvableObjectException(SerializationInfo info, StreamingContext c
115111

116112
#endregion
117113
}
118-
}
114+
}

0 commit comments

Comments
 (0)