make changes to get Spring.Aop work under .NET Core

Author: lahma

Spring.build

@@ -416,6 +416,7 @@ Commandline Examples:
 
         <exec program="dotnet" verbose="true">
           <arg line="test" />
+          <arg line="/nodeReuse:false" />
           <arg line="-c ${current.build.config}" />
           <arg line="-f netcoreapp2.1" />
           <arg line="${file}" />
@@ -425,7 +426,7 @@ Commandline Examples:
   </target>
 
   <target name="compile-net-4.5" description="Builds .NET Framework 4.5 version"
-        depends="set-net-4.5-runtime-configuration, check-spring-basedir, clean-current-bin-dir, restore-nuget-packages">
+        depends="set-net-4.5-runtime-configuration, check-spring-basedir, restore-nuget-packages">
 
 	<property name="test.withcoverage" value="false" overwrite="true"/>
 
@@ -469,7 +470,7 @@ Commandline Examples:
   </target>  
 
   <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version"
-          depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir">
+          depends="set-mono-2.0-runtime-configuration, check-spring-basedir">
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-ems" value="false" overwrite="true" />

Spring.include

@@ -151,12 +151,6 @@
         </if>
     </target>
     <!-- Targets for cleaning up -->
-    <target name="clean-current-bin-dir" depends="check-current-bin-dir"
-            description="Cleans the current binaries directory">
-        <echo message="Cleaning the ${current.bin.dir} binaries directory."/>
-        <delete dir="${current.bin.dir}" if="${directory::exists(current.bin.dir)}"/>
-        <mkdir dir="${current.bin.dir}"/>
-    </target>
     <target name="clean-current-sdkdoc-dir" depends="check-current-sdkdoc-dir"
             description="Cleans the current SDK documentation directory">
         <echo message="Cleaning the ${current.sdkdoc.dir} SDK documentation directory."/>

src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs

@@ -1,5 +1,3 @@
-#region License
-
 /*
  * Copyright © 2002-2011 the original author or authors.
  *
@@ -16,13 +14,10 @@
  * limitations under the License.
  */
 
-#endregion
-
-#region Imports
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 using AopAlliance.Aop;
 
@@ -34,8 +29,6 @@
 using Spring.Aop.Framework.DynamicProxy;
 using Spring.Core;
 
-#endregion
-
 namespace Spring.Aop.Framework.AutoProxy
 {
     /// <summary>
@@ -46,8 +39,6 @@ namespace Spring.Aop.Framework.AutoProxy
     /// <author>Bruno Baia</author>
     public class InheritanceBasedAopConfigurer : IObjectFactoryPostProcessor, IObjectFactoryAware, IOrdered
     {
-        #region Fields
-
         private IList objectNames;
         private string[] interceptorNames = new string[0];
         private bool proxyTargetAttributes = true;
@@ -58,10 +49,6 @@ public class InheritanceBasedAopConfigurer : IObjectFactoryPostProcessor, IObjec
         private int order = int.MaxValue;
         private IAdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.Instance;
 
-        #endregion
-
-        #region Properties
-
         /// <summary>
         /// Set the names of the objects in IList fashioned way 
         /// that should automatically get intercepted.
@@ -134,10 +121,6 @@ public bool ProxyInterfaces
             set { proxyInterfaces = value; }
         }
 
-        #endregion
-
-        #region IObjectFactoryAware Members
-
         /// <summary>
         /// Callback that supplies the owning factory to an object instance.
         /// </summary>
@@ -162,10 +145,6 @@ public IObjectFactory ObjectFactory
             set { objectFactory = value; }
         }
 
-        #endregion
-
-        #region IObjectFactoryPostProcessor Members
-
         /// <summary>
         /// Allows for custom modification of an application context's object definitions.
         /// </summary>
@@ -201,10 +180,6 @@ public void PostProcessObjectFactory(IConfigurableListableObjectFactory factory)
             }
         }
 
-        #endregion
-
-        #region IOrdered Members
-
         /// <summary>
         /// Return the order value of this object, where a higher value means greater in
         /// terms of sorting.
@@ -221,10 +196,6 @@ public virtual int Order
             set { order = value; }
         }
 
-        #endregion
-
-        #region Protected methods
-
         /// <summary>
         /// Determines whether the object is an infrastructure type,
         /// IAdvisor, IAdvice, IAdvisors, AbstractAutoProxyCreator or InheritanceBasedAopConfigurer.
@@ -302,10 +273,6 @@ protected virtual bool IsObjectNameMatch(string objectName)
             return false;
         }
 
-        #endregion
-
-        #region Private Methods
-
         private IList<IAdvisor> ResolveInterceptorNames()
         {
             List<IAdvisor> advisors = new List<IAdvisor>();
@@ -324,12 +291,8 @@ private IList<IAdvisor> ResolveInterceptorNames()
             return advisors;
         }
 
-        #endregion
-
-        #region InheritanceBasedAopTargetSource inner class definition
-
         [Serializable]
-        private class InheritanceBasedAopTargetSource : ITargetSource
+        private class InheritanceBasedAopTargetSource : ITargetSource, ISerializable
         {
             private readonly Type _targetType;
 
@@ -338,7 +301,19 @@ public InheritanceBasedAopTargetSource(Type targetType)
                 _targetType = targetType;
             }
 
-            #region ITargetSource Members
+            
+            /// <inheritdoc />
+            private InheritanceBasedAopTargetSource(SerializationInfo info, StreamingContext context)
+            {
+                var type = info.GetString("TargetType");
+                _targetType = type != null ? Type.GetType(type) : null;
+            }
+        
+            /// <inheritdoc />
+            public void GetObjectData(SerializationInfo info, StreamingContext context)
+            {
+                info.AddValue("TargetType", _targetType?.AssemblyQualifiedName);
+            }
 
             public object GetTarget()
             {
@@ -358,10 +333,6 @@ public Type TargetType
             {
                 get { return _targetType; }
             }
-
-            #endregion
         }
-
-        #endregion
     }
 }

src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs

@@ -1,5 +1,3 @@
-#region License
-
 /*
  * Copyright © 2002-2011 the original author or authors.
  *
@@ -16,8 +14,6 @@
  * limitations under the License.
  */
 
-#endregion
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -37,10 +33,8 @@ namespace Spring.Aop.Framework.DynamicProxy
     /// </summary>
     /// <author>Bruno Baia</author>
     [Serializable]
-    public class AdvisedProxy : IAdvised //, ISerializable
+    public class AdvisedProxy : IAdvised, ISerializable
     {
-        #region Fields
-
         /// <summary>
         /// Should we use dynamic reflection for method invocation ?
         /// </summary>
@@ -71,10 +65,6 @@ public class AdvisedProxy : IAdvised //, ISerializable
         /// </summary>
         public Type m_targetType;
 
-        #endregion
-
-        #region Constructor (s) / Destructor
-
         /// <summary>
         /// Creates a new instance of the <see cref="AdvisedProxy"/> class.
         /// </summary>
@@ -130,7 +120,9 @@ protected AdvisedProxy(SerializationInfo info, StreamingContext context)
             m_advised = (IAdvised)info.GetValue("advised", typeof(IAdvised));
             m_introductions = (IAdvice[])info.GetValue("introductions", typeof(IAdvice[]));
             m_targetSource = (ITargetSource)info.GetValue("targetSource", typeof(ITargetSource));
-            m_targetType = (Type)info.GetValue("targetType", typeof(Type));
+
+            var type = info.GetString("targetType");
+            m_targetType = type != null ? Type.GetType(type) : null;
         }
 
         /// <summary>
@@ -139,18 +131,14 @@ protected AdvisedProxy(SerializationInfo info, StreamingContext context)
         /// <param name="info">Serialization data.</param>
         /// <param name="context">Serialization context.</param>
         [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)]
-        protected virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             info.AddValue("advised", m_advised);
             info.AddValue("introductions", m_introductions);
             info.AddValue("targetSource", m_targetSource);
-            info.AddValue("targetType", m_targetType);
+            info.AddValue("targetType", m_targetType?.AssemblyQualifiedName);
         }
 
-        #endregion
-
-        #region Protected Methods
-
         /// <summary>
         /// Initialization method.
         /// </summary>
@@ -178,10 +166,6 @@ protected void Initialize(IAdvised advised, IAopProxy proxy)
             }
         }
 
-        #endregion
-
-        #region Public Methods
-
         /// <summary>
         /// Invokes intercepted methods using reflection
         /// </summary>
@@ -228,10 +212,6 @@ public IList<object> GetInterceptors(Type targetType, MethodInfo method)
             }
         }
 
-        #endregion
-
-        #region IAdvised Members
-
         bool IAdvised.ExposeProxy
         {
             get { return m_advised.ExposeProxy; }
@@ -400,10 +380,6 @@ string IAdvised.ToProxyConfigString()
             return m_advised.ToProxyConfigString();
         }
 
-        #endregion
-
-        #region ITargetTypeAware implementation
-
         /// <summary>
         /// Gets the target type behind the implementing object.
         /// Ttypically a proxy configuration or an actual proxy.
@@ -413,7 +389,5 @@ public Type TargetType
         {
             get { return m_targetType; }
         }
-
-        #endregion
     }
 }