target netstandard2.0 where possible

Author: lahma

Spring.build

@@ -853,7 +853,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

@@ -257,7 +257,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}" />

global.json

@@ -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/Directory.Build.props

@@ -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/Adapter/UnknownAdviceTypeException.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)

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

@@ -246,7 +246,13 @@ public virtual object PostProcessAfterInitialization(object obj, string objectNa
                 return obj;
             }
 
-            Type objectType = RemotingServices.IsTransparentProxy(obj)
+#if NETSTANDARD
+            var isTransparentProxy = false;
+#else
+            var isTransparentProxy = RemotingServices.IsTransparentProxy(obj);
+#endif
+
+            Type objectType = isTransparentProxy
                 ? ObjectFactory.GetType(objectName)
                 : obj.GetType();
 

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

@@ -376,7 +376,7 @@ protected virtual void DeclareLocals(ILGenerator il, MethodInfo method)
                 returnValue = il.DeclareLocal(method.ReturnType);
             }
 
-#if DEBUG
+#if DEBUG && !NETSTANDARD
             interceptors.SetLocalSymInfo("interceptors");
             targetType.SetLocalSymInfo("targetType");
             arguments.SetLocalSymInfo("arguments");

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

@@ -69,17 +69,7 @@ public override void PushTarget(ILGenerator il)
 
         #region Protected Methods
 
-        /// <summary>
-        /// Calculates and returns the list of attributes that apply to the
-        /// specified type.
-        /// </summary>
-        /// <remarks>
-        /// Removes <see cref="System.SerializableAttribute"/> from the list.
-        /// </remarks>
-        /// <param name="type">The type to find attributes for.</param>
-        /// <returns>
-        /// A list of custom attributes that should be applied to type.
-        /// </returns>
+        /// <inheritdoc />
         protected override IList GetTypeAttributes(Type type)
         {
             IList attrs = base.GetTypeAttributes(type);

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

@@ -82,7 +82,7 @@ protected override void DeclareLocals(ILGenerator il, MethodInfo method)
             base.DeclareLocals(il, method);
             target = il.DeclareLocal(typeof(object));
 
-#if DEBUG
+#if DEBUG && !NETSTANDARD
             target.SetLocalSymInfo("target");
 #endif
         }

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

@@ -44,7 +44,7 @@ namespace Spring.Aop.Support
     /// </p>
     /// <p>
     /// This base class is serializable. Subclasses should decorate all
-    /// fields with the <see cref="System.NonSerializedAttribute"/> - the
+    /// fields with the NonSerializedAttribute - the
     /// <see cref="AbstractRegularExpressionMethodPointcut.InitPatternRepresentation"/>
     /// method in this class will be invoked again on the client side on deserialization.
     /// </p>
@@ -76,21 +76,7 @@ protected AbstractRegularExpressionMethodPointcut()
         {
         }
 
-        /// <summary>
-        /// Creates a new instance of the <see cref="AbstractRegularExpressionMethodPointcut"/>
-        /// 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>
-        /// <exception cref="AopAlliance.Aop.AspectException">
-        /// If an error was encountered during the deserialization process.
-        /// </exception>
+        /// <inheritdoc />
         protected AbstractRegularExpressionMethodPointcut(
             SerializationInfo info, StreamingContext context)
         {
@@ -171,18 +157,7 @@ public virtual object[] Patterns
 
         #region Methods
 
-        /// <summary>
-        /// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
-        /// the data needed to serialize the target object.
-        /// </summary>
-        /// <param name="info">
-        /// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
-        /// with data.
-        /// </param>
-        /// <param name="context">
-        /// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
-        /// for this serialization.
-        /// </param>
+        /// <inheritdoc />
         [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
         public void GetObjectData(SerializationInfo info, StreamingContext context)
         {

src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs

@@ -75,21 +75,7 @@ public SdkRegularExpressionMethodPointcut(params string[] patterns)
             Patterns = patterns;
         }
 
-	    /// <summary>
-	    /// Creates a new instance of the
-	    /// <see cref="SdkRegularExpressionMethodPointcut"/> 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>
-	    /// <exception cref="AopAlliance.Aop.AspectException">
-	    /// If an error was encountered during the deserialization process.
-	    /// </exception>
+	    /// <inheritdoc />
 	    protected SdkRegularExpressionMethodPointcut(SerializationInfo info, StreamingContext context)
 	        : base(info, context)
 	    {

src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs

@@ -128,26 +128,13 @@ public override string ToString()
 			return "EmptyTargetSource: no target";
 		}
 
-		/// <summary>
-		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
-		/// the data needed to serialize the target object.
-		/// </summary>
-		/// <param name="info">
-		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
-		/// with data.
-		/// </param>
-		/// <param name="context">
-		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
-		/// for this serialization.
-		/// </param>
+		/// <inheritdoc />
 		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{
 			info.SetType(typeof (EmptyTargetSourceObjectReference));
 		}
 
-
-
 		[Serializable]
 		private sealed class EmptyTargetSourceObjectReference : IObjectReference
 		{

src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs

@@ -124,18 +124,7 @@ public override string ToString()
 			return "TrueMethodMatcher.True";
 		}
 
-		/// <summary>
-		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
-		/// the data needed to serialize the target object.
-		/// </summary>
-		/// <param name="info">
-		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
-		/// with data.
-		/// </param>
-		/// <param name="context">
-		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
-		/// for this serialization.
-		/// </param>
+		/// <inheritdoc />
 		[SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{

src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs

@@ -91,18 +91,7 @@ public override string ToString()
 			return "TruePointcut.TRUE";
 		}
 
-		/// <summary>
-		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
-		/// the data needed to serialize the target object.
-		/// </summary>
-		/// <param name="info">
-		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
-		/// with data.
-		/// </param>
-		/// <param name="context">
-		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
-		/// for this serialization.
-		/// </param>
+		/// <inheritdoc />
 		[SecurityPermission (SecurityAction.Demand,SerializationFormatter=true)]
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{

src/Spring/Spring.Aop/Aop/TruePointcut.cs

@@ -93,18 +93,7 @@ public override string ToString()
 			return "TrueTypeFilter.True";
 		}
 
-		/// <summary>
-		/// Populates a <see cref="System.Runtime.Serialization.SerializationInfo"/> with
-		/// the data needed to serialize the target object.
-		/// </summary>
-		/// <param name="info">
-		/// The <see cref="System.Runtime.Serialization.SerializationInfo"/> to populate
-		/// with data.
-		/// </param>
-		/// <param name="context">
-		/// The destination (see <see cref="System.Runtime.Serialization.StreamingContext"/>)
-		/// for this serialization.
-		/// </param>
+		/// <inheritdoc />
 		[SecurityPermission(SecurityAction.Demand, SerializationFormatter=true)]
 		public void GetObjectData(SerializationInfo info, StreamingContext context)
 		{

src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs

@@ -59,18 +59,7 @@ public AspectException(string message, Exception innerException)
 		{
 		}
 
-		/// <summary>
-		/// Creates a new instance of the
-		/// <see cref="AopAlliance.Aop.AspectException"/> 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 AspectException(SerializationInfo info, StreamingContext context)
 			: base(info, context)
 		{

src/Spring/Spring.Aop/AopAlliance/Aop/AspectException.cs

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;$(TargetFullFrameworkVersion)</TargetFrameworks>
     <Description>Interfaces and classes that provide AOP support in Spring.Net</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Antlr" Version="3.5.0.2" />
+    <PackageReference Include="Antlr3.Runtime" Version="3.5.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj" />

src/Spring/Spring.Aop/Spring.Aop.2010.csproj

@@ -47,7 +47,7 @@ public class AssemblyObjectDefinitionScanner : RequiredConstraintAssemblyTypeSca
             "NUnit",
             "Quartz",
             "NVelocity",
-            "Rhino.Mocks",
+            "FakeItEasy",
             "Apache.NMS"
         };
 

src/Spring/Spring.Core/Context/Attributes/AssemblyObjectDefinitionScanner.cs

@@ -22,7 +22,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using Common.Logging;
 using Spring.Util;
 
@@ -39,7 +38,7 @@ public class AssemblyTypeSource : IEnumerable<Type>
         /// </summary>
         protected static readonly ILog Logger = LogManager.GetLogger<AssemblyTypeSource>();
 
-        private readonly _Assembly _assembly;
+        private readonly Assembly _assembly;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AssemblyTypeSource"/> class.

src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs

@@ -173,7 +173,7 @@ public override Type BuildProxyType()
                     new ConfigurationClassProxyMethodBuilder(typeBuilder, this, false, targetMethods),
                     BaseType, this.DeclaredMembersOnly);
 
-                Type proxyType = typeBuilder.CreateType();
+                Type proxyType = typeBuilder.CreateTypeInfo();
 
                 // set target method references
                 foreach (DictionaryEntry entry in targetMethods)