Project updated to target .NET Standard 2.0 and async methods interception

SimpleProxy.Caching/SimpleProxy.Caching.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

SimpleProxy.Diagnostics/SimpleProxy.Diagnostics.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

SimpleProxy.Logging/SimpleProxy.Logging.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

SimpleProxy.UnitOfWork/SimpleProxy.UnitOfWork.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

SimpleProxy/Internal/CoreInterceptor.cs

@@ -1,4 +1,8 @@
-namespace SimpleProxy.Internal
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using SimpleProxy.Interfaces;
+
+namespace SimpleProxy.Internal
 {
     using System;
     using System.Linq;
@@ -9,7 +13,7 @@
     /// <summary>
     /// The Master Interceptor Class wraps a proxied object and handles all of its interceptions
     /// </summary>
-    internal class CoreInterceptor : IInterceptor
+    internal class CoreInterceptor : IAsyncInterceptor
     {
         /// <summary>
         /// Gets the <see cref="proxyConfiguration"/>
@@ -32,34 +36,116 @@ public CoreInterceptor(IServiceProvider serviceProvider, SimpleProxyConfiguratio
             this.proxyConfiguration = proxyConfiguration;
         }
 
-        /// <inheritdoc />
-        public void Intercept(IInvocation invocation)
+        public void InterceptSynchronous(IInvocation invocation)
         {
-            // Map the configured interceptors to this type based on its attributes
-            var invocationMetadataCollection = InvocationExtensions.GetInterceptorMetadataForMethod(invocation, this.serviceProvider, this.proxyConfiguration);
+            var proceedWithInterception = InterceptBeforeProceed(invocation, out var invocationMetadataCollection, out var orderingStrategy);
 
-            // If there are no configured interceptors, leave now
-            if (invocationMetadataCollection == null || !invocationMetadataCollection.Any())
+            if (!proceedWithInterception)
             {
                 invocation.Proceed();
                 return;
             }
 
-            // Get the Ordering Strategy for Interceptors
-            var orderingStrategy = this.proxyConfiguration.OrderingStrategy;
+            // Execute the Real Method
+            if (!invocationMetadataCollection.Any(p => p.InvocationIsBypassed))
+            {
+                invocation.Proceed();
+            }
 
-            // Process the BEFORE Interceptions
-            foreach (var invocationContext in orderingStrategy.OrderBeforeInterception(invocationMetadataCollection))
+            InterceptAfterProceed(invocationMetadataCollection, orderingStrategy);
+        }
+
+        public void InterceptAsynchronous(IInvocation invocation)
+        {
+            invocation.ReturnValue = InternalInterceptAsynchronous(invocation);
+        }
+
+        private async Task InternalInterceptAsynchronous(IInvocation invocation)
+        {
+            var proceedWithInterception = InterceptBeforeProceed(invocation, out var invocationMetadataCollection, out var orderingStrategy);
+
+            if (!proceedWithInterception)
             {
-                invocationContext.Interceptor.BeforeInvoke(invocationContext);
+                invocation.Proceed();
+                var task = (Task)invocation.ReturnValue;
+                await task;
+                return;
             }
 
             // Execute the Real Method
             if (!invocationMetadataCollection.Any(p => p.InvocationIsBypassed))
             {
                 invocation.Proceed();
+                var task = (Task)invocation.ReturnValue;
+                await task;
             }
 
+            InterceptAfterProceed(invocationMetadataCollection, orderingStrategy);
+        }
+
+        public void InterceptAsynchronous<TResult>(IInvocation invocation)
+        {
+            invocation.ReturnValue = InternalInterceptAsynchronous<TResult>(invocation);
+        }
+
+        private async Task<TResult> InternalInterceptAsynchronous<TResult>(IInvocation invocation)
+        {
+            var proceedWithInterception = InterceptBeforeProceed(invocation, out var invocationMetadataCollection, out var orderingStrategy);
+
+            TResult result;
+
+            if (!proceedWithInterception)
+            {
+                invocation.Proceed();
+                var task = (Task<TResult>)invocation.ReturnValue;
+                result = await task;
+                return result;
+            }
+
+            // Execute the Real Method
+            if (!invocationMetadataCollection.Any(p => p.InvocationIsBypassed))
+            {
+                invocation.Proceed();
+                var task = (Task<TResult>)invocation.ReturnValue;
+                result = await task;
+            }
+            else
+            {
+                result = default;
+            }
+
+            InterceptAfterProceed(invocationMetadataCollection, orderingStrategy);
+
+            return result;
+        }
+
+
+        private bool InterceptBeforeProceed(IInvocation invocation, out List<InvocationContext> invocationMetadataCollection, out IOrderingStrategy orderingStrategy)
+        {
+            // Map the configured interceptors to this type based on its attributes
+            invocationMetadataCollection = InvocationExtensions.GetInterceptorMetadataForMethod(invocation, this.serviceProvider, this.proxyConfiguration);
+
+            // If there are no configured interceptors, leave now
+            if (invocationMetadataCollection == null || !invocationMetadataCollection.Any())
+            {
+                orderingStrategy = null;
+                return false;
+            }
+
+            // Get the Ordering Strategy for Interceptors
+            orderingStrategy = this.proxyConfiguration.OrderingStrategy;
+
+            // Process the BEFORE Interceptions
+            foreach (var invocationContext in orderingStrategy.OrderBeforeInterception(invocationMetadataCollection))
+            {
+                invocationContext.Interceptor.BeforeInvoke(invocationContext);
+            }
+
+            return true;
+        }
+
+        private static void InterceptAfterProceed(List<InvocationContext> invocationMetadataCollection, IOrderingStrategy orderingStrategy)
+        {
             // Process the AFTER Interceptions
             foreach (var invocationContext in orderingStrategy.OrderAfterInterception(invocationMetadataCollection))
             {

SimpleProxy/InvocationContext.cs

@@ -136,7 +136,7 @@ public void SetTemporaryData(string name, object value)
         /// <returns></returns>
         public object GetTemporaryData(string name)
         {
-            return this.TempData.GetValueOrDefault(name);
+            return this.TempData.TryGetValue(name, out var value) ? value : default;
         }
 
         /// <summary>

SimpleProxy/SimpleProxy.csproj

@@ -1,23 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Simple Proxy is a simple extension library built to solve the problem of Aspect Orientated Programming in Net Core projects</Description>
     <Copyright>Robert Perry</Copyright>
     <RepositoryUrl>https://github.com/f135ta/SimpleProxy</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="Castle.Core.AsyncInterceptor" Version="1.7.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Runtime">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.2.0\ref\netcoreapp2.2\System.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>