Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
XmlLogger now correctly closes its stream and the worker trampolines …
…the config as approprite.
- Loading branch information
Tobbe Gyllebring
committed
Aug 13, 2019
1 parent
c3182ea
commit b164986
Showing
19 changed files
with
195 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| @echo off | ||
| pushd Specs\Cone.Specs | ||
| dotnet ..\..\Build\dotnet-conesole\Debug\netcoreapp2.0\dotnet-conesole.dll | ||
| dotnet ..\..\Build\dotnet-conesole\Debug\netcoreapp2.2\dotnet-conesole.dll | ||
| popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,92 @@ | ||
| using System; | ||
| using System.Collections.Concurrent; | ||
| using System.Linq.Expressions; | ||
| using System.Reflection; | ||
| using System.Threading.Tasks; | ||
| using System.Linq; | ||
|
|
||
| namespace Cone.Core | ||
| { | ||
| public struct Invokable : ICustomAttributeProvider | ||
| { | ||
| static Func<object, object> TaskAwait = obj => { | ||
| var awaiter = ((Task)obj).GetAwaiter(); | ||
| awaiter.GetResult(); | ||
| return null; | ||
| }; | ||
|
|
||
| static readonly ConcurrentDictionary<Type, Func<object, object>> awaiterCache = new ConcurrentDictionary<Type, Func<object, object>>(); | ||
|
|
||
| readonly MethodInfo method; | ||
| readonly Func<object, object> awaitAction; | ||
|
|
||
| public Invokable(MethodInfo method) { | ||
| this.method = method; | ||
| this.awaitAction = GetAwaiterOrDefault(method.ReturnType); | ||
| using System; | ||
| using System.Collections.Concurrent; | ||
| using System.Linq.Expressions; | ||
| using System.Reflection; | ||
| using System.Threading.Tasks; | ||
| using System.Linq; | ||
|
|
||
| namespace Cone.Core | ||
| { | ||
| public struct Invokable : ICustomAttributeProvider | ||
| { | ||
| static Func<object, object> TaskAwait = obj => { | ||
| var awaiter = ((Task)obj).GetAwaiter(); | ||
| awaiter.GetResult(); | ||
| return null; | ||
| }; | ||
|
|
||
| static readonly ConcurrentDictionary<Type, Func<object, object>> awaiterCache = new ConcurrentDictionary<Type, Func<object, object>>(); | ||
|
|
||
| readonly MethodInfo method; | ||
| readonly Func<object, object> awaitAction; | ||
|
|
||
| public Invokable(MethodInfo method) { | ||
| this.method = method; | ||
| this.awaitAction = GetAwaiterOrDefault(method.ReturnType); | ||
| } | ||
|
|
||
| public bool IsAsync => GetCustomAttributes(true).Any(x => x.GetType().FullName == "System.Runtime.CompilerServices.AsyncStateMachineAttribute"); | ||
| public string Location => $"{method.ReturnType} {method.DeclaringType}.{method.Name}({method.GetParameters().Select(x => x.ToString()).Join(", ")})"; | ||
|
|
||
| internal MethodInfo Target => method; | ||
| public Type ReturnType => method.ReturnType; | ||
| public Type DeclaringType => method.DeclaringType; | ||
| public string Name => method.Name; | ||
| public bool IsWaitable => awaitAction != null; | ||
| public bool IsStatic => method.IsStatic; | ||
|
|
||
| public object[] GetCustomAttributes(bool inherit) => | ||
| method.GetCustomAttributes(inherit); | ||
|
|
||
| public object[] GetCustomAttributes(Type attributeType, bool inherit) => | ||
| method.GetCustomAttributes(attributeType, inherit); | ||
|
|
||
| public bool IsDefined(Type attributeType, bool inherit) => | ||
| method.IsDefined(attributeType, inherit); | ||
|
|
||
| public ParameterInfo[] GetParameters() => | ||
| method.GetParameters(); | ||
|
|
||
| public object Invoke(object target, object[] args) => | ||
| method.Invoke(target, args); | ||
|
|
||
| public object Await(object target, object[] args) { | ||
| var r = Invoke(target, args); | ||
| return IsWaitable ? awaitAction(r) : r; | ||
| } | ||
|
|
||
| static Func<object, object> GetAwaiterOrDefault(Type type) { | ||
| if(type == typeof(void)) | ||
| return null; | ||
|
|
||
| if(type == typeof(Task)) | ||
| return TaskAwait; | ||
|
|
||
| return awaiterCache.GetOrAdd(type, CreateAwaiterOrDefault); | ||
| } | ||
|
|
||
| static Func<object, object> CreateAwaiterOrDefault(Type type) { | ||
| var getAwaiter = type.GetMethod("GetAwaiter", Type.EmptyTypes); | ||
| if(getAwaiter != null) { | ||
| var getResult = getAwaiter.ReturnType.GetMethod("GetResult") ?? | ||
| throw new InvalidOperationException("Can't GetResult on " + getAwaiter.ReturnType); | ||
|
|
||
| var awaitable = Expression.Parameter(typeof(object)); | ||
| var getUnboxedResult = Expression.Call( | ||
| Expression.Call( | ||
| Expression.Convert(awaitable, type), | ||
| getAwaiter), | ||
| getResult); | ||
| var body = getUnboxedResult.Type == typeof(void) | ||
| ? Expression.Block(getUnboxedResult, Expression.Constant(null)) | ||
| : getUnboxedResult.Box(); | ||
| return Expression.Lambda<Func<object, object>>(body, awaitable) | ||
| .Compile(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static void Await(object obj) => | ||
| GetAwaiterOrDefault(obj.GetType())?.DynamicInvoke(obj); | ||
| } | ||
|
|
||
| internal MethodInfo Target => method; | ||
| public Type ReturnType => method.ReturnType; | ||
| public Type DeclaringType => method.DeclaringType; | ||
| public string Name => method.Name; | ||
| public bool IsWaitable => awaitAction != null; | ||
| public bool IsStatic => method.IsStatic; | ||
|
|
||
| public object[] GetCustomAttributes(bool inherit) => | ||
| method.GetCustomAttributes(inherit); | ||
|
|
||
| public object[] GetCustomAttributes(Type attributeType, bool inherit) => | ||
| method.GetCustomAttributes(attributeType, inherit); | ||
|
|
||
| public bool IsDefined(Type attributeType, bool inherit) => | ||
| method.IsDefined(attributeType, inherit); | ||
|
|
||
| public ParameterInfo[] GetParameters() => | ||
| method.GetParameters(); | ||
|
|
||
| public object Invoke(object target, object[] args) => | ||
| method.Invoke(target, args); | ||
|
|
||
| public object Await(object target, object[] args) { | ||
| var r = Invoke(target, args); | ||
| return IsWaitable ? awaitAction(r) : r; | ||
| } | ||
|
|
||
| static Func<object, object> GetAwaiterOrDefault(Type type) { | ||
| if(type == typeof(void)) | ||
| return null; | ||
|
|
||
| if(type == typeof(Task)) | ||
| return TaskAwait; | ||
|
|
||
| return awaiterCache.GetOrAdd(type, CreateAwaiterOrDefault); | ||
| } | ||
|
|
||
| static Func<object, object> CreateAwaiterOrDefault(Type type) { | ||
| var getAwaiter = type.GetMethod("GetAwaiter", Type.EmptyTypes); | ||
| if(getAwaiter != null) { | ||
| var getResult = getAwaiter.ReturnType.GetMethod("GetResult") ?? | ||
| throw new InvalidOperationException("Can't GetResult on " + getAwaiter.ReturnType); | ||
|
|
||
| var awaitable = Expression.Parameter(typeof(object)); | ||
| var getUnboxedResult = Expression.Call( | ||
| Expression.Call( | ||
| Expression.Convert(awaitable, type), | ||
| getAwaiter), | ||
| getResult); | ||
| var body = getUnboxedResult.Type == typeof(void) | ||
| ? Expression.Block(getUnboxedResult, Expression.Constant(null)) | ||
| : getUnboxedResult.Box(); | ||
| return Expression.Lambda<Func<object, object>>(body, awaitable) | ||
| .Compile(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static void Await(object obj) => | ||
| GetAwaiterOrDefault(obj.GetType())?.DynamicInvoke(obj); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.