diff --git a/NBi.Core/Scalar/Resolver/CSharpScalarResolver.cs b/NBi.Core/Scalar/Resolver/CSharpScalarResolver.cs index 571f53073..4faf7aeb7 100644 --- a/NBi.Core/Scalar/Resolver/CSharpScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/CSharpScalarResolver.cs @@ -75,5 +75,7 @@ public static object Function() Type function = results.CompiledAssembly.GetType("NBi.Core.Variable.Dynamic.VariableClass"); return function.GetMethod("Function"); } + + object IScalarResolver.Execute() => Execute(); } } \ No newline at end of file diff --git a/NBi.Core/Scalar/Resolver/EnvironmentScalarResolver.cs b/NBi.Core/Scalar/Resolver/EnvironmentScalarResolver.cs index 4838f9558..258d42903 100644 --- a/NBi.Core/Scalar/Resolver/EnvironmentScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/EnvironmentScalarResolver.cs @@ -20,5 +20,7 @@ public T Execute() var value = Environment.GetEnvironmentVariable(args.Name, EnvironmentVariableTarget.User); return (T)Convert.ChangeType(value, typeof(T)); } + + object IScalarResolver.Execute() => Execute(); } } diff --git a/NBi.Core/Scalar/Resolver/FormatScalarResolver.cs b/NBi.Core/Scalar/Resolver/FormatScalarResolver.cs index a98a673f6..ff44ac69a 100644 --- a/NBi.Core/Scalar/Resolver/FormatScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/FormatScalarResolver.cs @@ -32,5 +32,7 @@ public string Execute() var value = formatter.Execute(args.Text); return value; } + + object IScalarResolver.Execute() => Execute(); } } diff --git a/NBi.Core/Scalar/Resolver/FunctionScalarResolverArgs.cs b/NBi.Core/Scalar/Resolver/FunctionScalarResolverArgs.cs index e516b5d4e..fc8ff589e 100644 --- a/NBi.Core/Scalar/Resolver/FunctionScalarResolverArgs.cs +++ b/NBi.Core/Scalar/Resolver/FunctionScalarResolverArgs.cs @@ -13,6 +13,9 @@ public class FunctionScalarResolverArgs : IScalarResolverArgs public IEnumerable Transformations { get; } public FunctionScalarResolverArgs(IScalarResolver resolver, IEnumerable transformations) - => (Resolver, Transformations) = (resolver, transformations); + { + Resolver = resolver; + Transformations = transformations; + } } } diff --git a/NBi.Core/Scalar/Resolver/GlobalVariableScalarResolver.cs b/NBi.Core/Scalar/Resolver/GlobalVariableScalarResolver.cs index 6ce1f6050..93058d242 100644 --- a/NBi.Core/Scalar/Resolver/GlobalVariableScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/GlobalVariableScalarResolver.cs @@ -32,6 +32,8 @@ public T Execute() return (T)typedEvaluation; } + object IScalarResolver.Execute() => Execute(); + private void DisplayVariable(string name, object value) { var invariantCulture = new CultureFactory().Invariant; diff --git a/NBi.Core/Scalar/Resolver/IScalarResolver.cs b/NBi.Core/Scalar/Resolver/IScalarResolver.cs index e8f643b86..e1220b61a 100644 --- a/NBi.Core/Scalar/Resolver/IScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/IScalarResolver.cs @@ -6,7 +6,12 @@ namespace NBi.Core.Scalar.Resolver { - public interface IScalarResolver + public interface IScalarResolver + { + object Execute(); + } + + public interface IScalarResolver : IScalarResolver { T Execute(); } diff --git a/NBi.Core/Scalar/Resolver/LiteralScalarResolver.cs b/NBi.Core/Scalar/Resolver/LiteralScalarResolver.cs index 138428993..22c482ea4 100644 --- a/NBi.Core/Scalar/Resolver/LiteralScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/LiteralScalarResolver.cs @@ -37,5 +37,7 @@ public T Execute() Trace.WriteLineIf(Extensibility.NBiTraceSwitch.TraceVerbose, $"Literal evaluated to: {output}"); return (T)output; } + + object IScalarResolver.Execute() => Execute(); } } diff --git a/NBi.Core/Scalar/Resolver/ProjectionResultSetScalarResolver.cs b/NBi.Core/Scalar/Resolver/ProjectionResultSetScalarResolver.cs index f701f1c5b..edc50bb92 100644 --- a/NBi.Core/Scalar/Resolver/ProjectionResultSetScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/ProjectionResultSetScalarResolver.cs @@ -26,5 +26,7 @@ public T Execute() return (T)Convert.ChangeType(projectionResult, typeof(T)); } + + object IScalarResolver.Execute() => Execute(); } } diff --git a/NBi.Core/Scalar/Resolver/QueryScalarResolver.cs b/NBi.Core/Scalar/Resolver/QueryScalarResolver.cs index 1bef00204..8ecb49b10 100644 --- a/NBi.Core/Scalar/Resolver/QueryScalarResolver.cs +++ b/NBi.Core/Scalar/Resolver/QueryScalarResolver.cs @@ -45,5 +45,7 @@ public T Execute() var value = ExecuteQuery(cmd); return (T)Convert.ChangeType(value, typeof(T)); } + + object IScalarResolver.Execute() => Execute(); } }