create netstandard2.0 targets

* Spring.Aop
* Spring.Core
* Spring.Data
* Spring.Messaging
* Spring.Testing.NUnit

Author: lahma

Spring.build

@@ -375,7 +375,7 @@ Commandline Examples:
 		</items>
 	  </in>
       <do>
-		<echo message="Running tests for ${path}" />
+		<echo message="Running .NET Framework tests for ${path}" />
         <property name="test.bin.dir" value="${path}/net452" />
         <property name="test.assemblyname" value="${string::substring(path, string::last-index-of(path, '\') + 1, string::get-length(path) - string::last-index-of(path, '\') - 1)}" />
         <property name="test.assemblyfile" value="${test.assemblyname}.dll" />
@@ -384,6 +384,9 @@ Commandline Examples:
       </do>
     </foreach>	
 
+	<!-- run .NET Core separately for now -->
+    <call target="compile-test-netcore" />
+	
     <!-- build coverage summary -->
 	<exec program="${tool.dir}/ncoverexplorer/ncoverexplorer.console.exe" workingdir="${current.bin.dir}" failonerror="false" if="${test.coverage.tool == 'ncover' and test.withcoverage}">
 		<arg value="/xml:&quot;${current.bin.dir}/TestCoverageSummary.xml&quot;" />
@@ -400,8 +403,32 @@ Commandline Examples:
 	</exec>
   </target>
 
+  <target name="compile-test-netcore">
+    <foreach item="File" property="file">
+	  <in>
+	    <items>
+		   <include name="${spring.basedir}/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2010.csproj" />
+		   <include name="${spring.basedir}/test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.2010.csproj" />
+		</items>
+	  </in>
+      <do>
+        <echo message="Running .NET Core tests for ${file}" />
+
+        <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}" />
+		</exec>
+      </do>
+    </foreach>	
+  </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"/>
 
@@ -445,7 +472,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" />
@@ -853,7 +880,6 @@ Commandline Examples:
           <include name="**/nunit.*.xml"/>
           <include name="**/NUnitAsp.dll"/>
           <include name="**/NUnitAspEx.dll"/>
-          <include name="**/Rhino.Mocks.dll"/>
           <include if="${not net-4.0}" name="**/System.Web.Extensions.dll"/>
           <include name="**/Apache.NMS.dll"/>
           <include name="**/Apache.NMS.pdb"/>

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."/>
@@ -257,7 +251,6 @@
 	        <import namespace="System.Reflection" />
 	    </imports>
 	    <attributes>
-		<attribute type="CLSCompliantAttribute" value="${assembly.is-cls-compliant}" />
 		<attribute type="AssemblyConfigurationAttribute" value="${assembly.configuration}" />
 		<attribute type="AssemblyProductAttribute" value="${assembly.product}" />
 		<attribute type="AssemblyCompanyAttribute" value="${assembly.company}" />

build-support/solutions.build.nant

@@ -31,6 +31,7 @@ Rebuilding Solutions using Nant and "solutions.build":
           <exclude name="examples/**/Spring.EmsQuickStart/*" />
           <exclude name="examples/**/Spring.Examples.Pool/*" />
           <exclude name="examples/**/SpringAir/*" />
+          <exclude name="examples/**/Spring.WebQuickStart/*" />
         </items>
       </in>
       <do>

src/Directory.Build.props

@@ -36,14 +36,14 @@
 
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 
-    <CLSCompliant>True</CLSCompliant>
     <ComVisible>False</ComVisible>
 
     <DebugSymbols>True</DebugSymbols>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 
     <LangVersion>latest</LangVersion>
+    <TargetFullFrameworkVersion>net452</TargetFullFrameworkVersion>
 
   </PropertyGroup>
 

src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs

@@ -41,18 +41,18 @@ public class UnknownAdviceTypeException : ArgumentException
         /// Creates a new instance of the
         /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
         /// </summary>
-        /// <param name="advice">The advice that caused the exception.</param>
-        public UnknownAdviceTypeException(object advice)
-            : base("No adapter for IAdvice of type ["
-                   + (advice != null ? advice.GetType().FullName : "null") + "].")
+        public UnknownAdviceTypeException()
         {
         }
 
         /// <summary>
         /// Creates a new instance of the
         /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
         /// </summary>
-        public UnknownAdviceTypeException()
+        /// <param name="advice">The advice that caused the exception.</param>
+        public UnknownAdviceTypeException(object advice)
+            : base("No adapter for IAdvice of type ["
+                   + (advice != null ? advice.GetType().FullName : "null") + "].")
         {
         }
 
@@ -84,18 +84,7 @@ public UnknownAdviceTypeException(string message, Exception rootCause)
         {
         }
 
-        /// <summary>
-        /// Creates a new instance of the
-        /// <see cref="Spring.Aop.Framework.Adapter.UnknownAdviceTypeException"/> class.
-        /// </summary>
-        /// <param name="info">
-        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
-        /// that holds the serialized object data about the exception being thrown.
-        /// </param>
-        /// <param name="context">
-        /// The <see cref="System.Runtime.Serialization.StreamingContext"/>
-        /// that contains contextual information about the source or destination.
-        /// </param>
+        /// <inheritdoc />
         protected UnknownAdviceTypeException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs

@@ -1,5 +1,3 @@
-#region License
-
 /*
  * Copyright © 2002-2011 the original author or authors.
  *
@@ -16,12 +14,11 @@
  * limitations under the License.
  */
 
-#endregion
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.Serialization;
 using System.Text;
 
 using AopAlliance.Aop;
@@ -56,8 +53,6 @@ namespace Spring.Aop.Framework
     [Serializable]
     public class AdvisedSupport : ProxyConfig, IAdvised
     {
-        #region Fields
-
         /// <summary>The list of advice.</summary>
         /// <remarks>
         /// <p>
@@ -108,7 +103,7 @@ public class AdvisedSupport : ProxyConfig, IAdvised
         /// <summary>
         /// The list of <see cref="Spring.Aop.Framework.AdvisedSupport"/> event listeners.
         /// </summary>
-        private readonly IList<IAdvisedSupportListener> listeners = new List<IAdvisedSupportListener>();
+        private readonly List<IAdvisedSupportListener> listeners = new List<IAdvisedSupportListener>();
 
         /// <summary>
         /// The advisor chain factory.
@@ -121,10 +116,6 @@ public class AdvisedSupport : ProxyConfig, IAdvised
         /// </summary>
         private bool autoDetectInterfaces;
 
-        #endregion
-
-        #region Constructor(s)
-
         /// <summary>
         /// Creates a new instance of the
         /// <see cref="Spring.Aop.Framework.AdvisedSupport"/> class using the
@@ -187,9 +178,46 @@ public AdvisedSupport(ITargetSource targetSource)
             TargetSource = targetSource;
         }
 
-        #endregion
+        /// <inheritdoc />
+        protected AdvisedSupport(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            _advisors = (List<IAdvisor>) info.GetValue("advisors", typeof(List<IAdvisor>));
+            _advisorsArray = (IAdvisor[]) info.GetValue("advisorsArray", typeof(IAdvisor[]));
+            _introductions = (List<IIntroductionAdvisor>) info.GetValue("introductions", typeof(List<IIntroductionAdvisor>));
 
-        #region IAdvised implementation
+            var map = (Dictionary<string, IIntroductionAdvisor>) info.GetValue("interfaceMap", typeof(Dictionary<string, IIntroductionAdvisor>));
+            interfaceMap = new Dictionary<Type, IIntroductionAdvisor>();
+            foreach (var pair in map)
+            {
+                interfaceMap[Type.GetType(pair.Key)] = pair.Value;
+            }
+            m_targetSource = (ITargetSource) info.GetValue("targetSource", typeof(ITargetSource));
+            isActive = info.GetBoolean("isActive");
+            listeners = (List<IAdvisedSupportListener>) info.GetValue("listeners", typeof(List<IAdvisedSupportListener>));
+            advisorChainFactory = (IAdvisorChainFactory) info.GetValue("advisorChainFactory", typeof(IAdvisorChainFactory));
+            autoDetectInterfaces = info.GetBoolean("autoDetectInterfaces");
+        }
+
+        /// <inheritdoc />
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("advisors", _advisors);
+            info.AddValue("advisorsArray", _advisorsArray);
+            info.AddValue("introductions", _introductions);
+            var map = new Dictionary<string, IIntroductionAdvisor>();
+            foreach (var pair in interfaceMap)
+            {
+                map.Add(pair.Key.AssemblyQualifiedName, pair.Value);
+            }
+            info.AddValue("interfaceMap", map);
+            info.AddValue("targetSource", m_targetSource);
+            info.AddValue("isActive", isActive);
+            info.AddValue("listeners", listeners);
+            info.AddValue("advisorChainFactory", advisorChainFactory);
+            info.AddValue("autoDetectInterfaces", autoDetectInterfaces);
+        }
 
         /// <summary>
         /// Gets and sets the
@@ -943,10 +971,6 @@ protected virtual string ToProxyConfigStringInternal()
             return buffer.ToString();            
         }
 
-        #endregion
-
-        #region Properties
-
         /// <summary>
         /// Gets the target type behind the implementing object.
         /// Ttypically a proxy configuration or an actual proxy.
@@ -992,8 +1016,6 @@ protected bool IsActive
             get { return isActive; }
         }
 
-        #endregion
-
         /// <summary>
         /// Specifies the <see cref="System.Type"/> of proxies that are to be
         /// created for this instance of proxy config.
@@ -1342,8 +1364,6 @@ private void UpdateAdvisorsArray()
             this._advisorsArray = advisorsArray;
         }
 
-        #region IAdvisedSupportListener support
-
         /// <summary>
         /// Callback method that is invoked when the list of proxied interfaces
         /// has changed.
@@ -1399,8 +1419,6 @@ protected void Activate()
             }
         }
 
-        #endregion
-
         /// <summary> 
         /// Creates an AOP proxy using this instance's configuration data.
         /// </summary>

src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs

@@ -71,18 +71,7 @@ public AopConfigException (string message, Exception rootCause)
 		{
 		}
 
-		/// <summary>
-		/// Creates a new instance of the
-		/// <see cref="Spring.Aop.Framework.AopConfigException"/> class.
-		/// </summary>
-		/// <param name="info">
-		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/>
-		/// that holds the serialized object data about the exception being thrown.
-		/// </param>
-		/// <param name="context">
-		/// The <see cref="System.Runtime.Serialization.StreamingContext"/>
-		/// that contains contextual information about the source or destination.
-		/// </param>
+		/// <inheritdoc />
 		protected AopConfigException (
 			SerializationInfo info, StreamingContext context)
 			: base (info, context)