Merge branch 'feature/Inline_native-transformation_with_variables_(#436…

…)' of https://github.com/Seddryck/NBi into feature/Inline_native-transformation_with_variables_(#436)

# Conflicts:
#	NBi.NUnit/Builder/Helper/ScalarResolverArgsBuilder.cs

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();
     }
 }

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();
     }
 }

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();
     }
 }

NBi.Core/Scalar/Resolver/FunctionScalarResolverArgs.cs

@@ -13,6 +13,9 @@ public class FunctionScalarResolverArgs : IScalarResolverArgs
         public IEnumerable<INativeTransformation> Transformations { get; }
 
         public FunctionScalarResolverArgs(IScalarResolver resolver, IEnumerable<INativeTransformation> transformations)
-            => (Resolver, Transformations) = (resolver, transformations);
+        {
+            Resolver = resolver;
+            Transformations = transformations;
+        }
     }
 }

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;

NBi.Core/Scalar/Resolver/IScalarResolver.cs

@@ -6,7 +6,12 @@
 
 namespace NBi.Core.Scalar.Resolver
 {
-    public interface IScalarResolver<T>
+    public interface IScalarResolver
+    {
+        object Execute();
+    }
+
+    public interface IScalarResolver<T> : IScalarResolver
     {
         T Execute();
     }

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();
     }
 }

NBi.Core/Scalar/Resolver/ProjectionResultSetScalarResolver.cs

@@ -26,5 +26,7 @@ public T Execute()
 
             return (T)Convert.ChangeType(projectionResult, typeof(T));
         }
+
+        object IScalarResolver.Execute() => Execute();
     }
 }

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();
     }
 }