Preserves the stack trace when unwrapping TargetInvocationException (#1443)

* Also follow up to NH-3500 which was only partially fixed.
* Fixes #1441

Author: fredericDelaporte

src/NHibernate/Async/Linq/DefaultQueryProvider.cs

@@ -44,7 +44,7 @@ protected virtual async Task<object> ExecuteQueryAsync(NhLinqExpression nhLinqEx
 				}
 				catch (TargetInvocationException e)
 				{
-					throw e.InnerException;
+					throw ReflectHelper.UnwrapTargetInvocationException(e);
 				}
 			}
 

src/NHibernate/Intercept/DefaultDynamicLazyFieldInterceptor.cs

@@ -51,16 +51,7 @@ public object Intercept(InvocationInfo info)
 				}
 			}
 
-			object returnValue;
-			try
-			{
-				returnValue = info.InvokeMethodOnTarget();
-			}
-			catch (TargetInvocationException ex)
-			{
-				throw ReflectHelper.UnwrapTargetInvocationException(ex);
-			}
-			return returnValue;
+			return info.InvokeMethodOnTarget();
 		}
 	}
 }

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -211,7 +211,7 @@ protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery
 				}
 				catch (TargetInvocationException e)
 				{
-					throw e.InnerException;
+					throw ReflectHelper.UnwrapTargetInvocationException(e);
 				}
 			}
 

src/NHibernate/Persister/PersisterFactory.cs

@@ -6,6 +6,7 @@
 using NHibernate.Mapping;
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
 
 namespace NHibernate.Persister
 {
@@ -101,7 +102,7 @@ public static IEntityPersister Create(System.Type persisterClass, PersistentClas
 				Exception e = tie.InnerException;
 				if (e is HibernateException)
 				{
-					throw e;
+					throw ReflectHelper.UnwrapTargetInvocationException(tie);
 				}
 				else
 				{
@@ -143,7 +144,7 @@ public static ICollectionPersister Create(System.Type persisterClass, Mapping.Co
 				Exception e = tie.InnerException;
 				if (e is HibernateException)
 				{
-					throw e;
+					throw ReflectHelper.UnwrapTargetInvocationException(tie);
 				}
 				else
 				{

src/NHibernate/Proxy/DynamicProxy/InvocationInfo.cs

@@ -6,10 +6,10 @@
 
 #endregion
 
-using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text;
+using NHibernate.Util;
 
 namespace NHibernate.Proxy.DynamicProxy
 {
@@ -105,7 +105,16 @@ private string GetMethodName(MethodInfo method)
 
 		public virtual object InvokeMethodOnTarget()
 		{
-			return _callbackMethod.Invoke(Target, Arguments);
+			object returnValue;
+			try
+			{
+				returnValue = _callbackMethod.Invoke(Target, Arguments);
+			}
+			catch (TargetInvocationException ex)
+			{
+				throw ReflectHelper.UnwrapTargetInvocationException(ex);
+			}
+			return returnValue;
 		}
 	}
-}
+}