Update #397 to fix conflicts

src/Benchmark/Benchmark.csproj

@@ -19,14 +19,15 @@
       </Compile>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
         <PackageReference Include="ExpressionDebugger" Version="2.2.1" />
         <PackageReference Include="ExpressionTranslator" Version="2.5.0" />
         <PackageReference Include="AutoMapper" Version="10.1.1" />
-        <PackageReference Include="Expressmapper" Version="1.9.1" />
-        <PackageReference Include="FastExpressionCompiler" Version="3.1.0" />
+        <PackageReference Include="FastExpressionCompiler" Version="3.2.1" />
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
+        <ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
         <ProjectReference Include="..\Mapster\Mapster.csproj" />
     </ItemGroup>
     <ItemGroup>

src/Benchmark/Benchmarks/TestAll.cs

@@ -83,10 +83,10 @@ public void SetupFec()
         [GlobalSetup(Target = nameof(CodegenTest))]
         public void SetupCodegen()
         {
-            _fooInstance = TestAdaptHelper.SetupFooInstance();
-            _customerInstance = TestAdaptHelper.SetupCustomerInstance();
-            FooMapper.Map(_fooInstance);
-            CustomerMapper.Map(_customerInstance);
+            //_fooInstance = TestAdaptHelper.SetupFooInstance();
+            //_customerInstance = TestAdaptHelper.SetupCustomerInstance();
+            //FooMapper.Map(_fooInstance);
+            //CustomerMapper.Map(_customerInstance);
         }
 
         [GlobalSetup(Target = nameof(ExpressMapperTest))]

src/Benchmark/Benchmarks/TestComplexTypes.cs

@@ -70,8 +70,8 @@ public void SetupFec()
         [GlobalSetup(Target = nameof(CodegenTest))]
         public void SetupCodegen()
         {
-            _customerInstance = TestAdaptHelper.SetupCustomerInstance();
-            CustomerMapper.Map(_customerInstance);
+            //_customerInstance = TestAdaptHelper.SetupCustomerInstance();
+            //CustomerMapper.Map(_customerInstance);
         }
 
         [GlobalSetup(Target = nameof(ExpressMapperTest))]

src/Benchmark/Benchmarks/TestSimpleTypes.cs

@@ -71,8 +71,8 @@ public void SetupFec()
         [GlobalSetup(Target = nameof(CodegenTest))]
         public void SetupCodegen()
         {
-            _fooInstance = TestAdaptHelper.SetupFooInstance();
-            FooMapper.Map(_fooInstance);
+            //_fooInstance = TestAdaptHelper.SetupFooInstance();
+            //FooMapper.Map(_fooInstance);
         }
 
         [GlobalSetup(Target = nameof(ExpressMapperTest))]

src/Benchmark/TestAdaptHelper.cs

@@ -88,7 +88,7 @@ public static void ConfigureMapster(Foo fooInstance, MapsterCompilerType type)
         }
         public static void ConfigureExpressMapper(Foo fooInstance)
         {
-            ExpressMapper.Mapper.Map<Foo, Foo>(fooInstance); //exercise
+            //ExpressMapper.Mapper.Map<Foo, Foo>(fooInstance); //exercise
         }
         public static void ConfigureAutoMapper(Foo fooInstance)
         {
@@ -103,7 +103,7 @@ public static void ConfigureMapster(Customer customerInstance, MapsterCompilerTy
         }
         public static void ConfigureExpressMapper(Customer customerInstance)
         {
-            ExpressMapper.Mapper.Map<Customer, CustomerDTO>(customerInstance);  //exercise
+            //ExpressMapper.Mapper.Map<Customer, CustomerDTO>(customerInstance);  //exercise
         }
         public static void ConfigureAutoMapper(Customer customerInstance)
         {
@@ -121,7 +121,7 @@ public static void TestExpressMapper<TSrc, TDest>(TSrc item, int iterations)
             where TSrc : class
             where TDest : class, new()
         {
-            Loop(item, get => ExpressMapper.Mapper.Map<TSrc, TDest>(get), iterations);
+            //Loop(item, get => ExpressMapper.Mapper.Map<TSrc, TDest>(get), iterations);
         }
 
         public static void TestAutoMapper<TSrc, TDest>(TSrc item, int iterations)
@@ -133,12 +133,12 @@ public static void TestAutoMapper<TSrc, TDest>(TSrc item, int iterations)
 
         public static void TestCodeGen(Foo item, int iterations)
         {
-            Loop(item, get => FooMapper.Map(get), iterations);
+            //Loop(item, get => FooMapper.Map(get), iterations);
         }
 
         public static void TestCodeGen(Customer item, int iterations)
         {
-            Loop(item, get => CustomerMapper.Map(get), iterations);
+            //Loop(item, get => CustomerMapper.Map(get), iterations);
         }
 
         private static void Loop<T>(T item, Action<T> action, int iterations)

src/ExpressionDebugger.Console/ExpressionDebugger.Console.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+	<UseNETCoreGenerator>true</UseNETCoreGenerator>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="untitled.cs" />
+  </ItemGroup>
+</Project>

src/ExpressionDebugger.Console/Program.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Linq.Expressions;
+
+namespace ExpressionDebugger.Console
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var p1 = Expression.Parameter(typeof(int));
+            var p2 = Expression.Parameter(typeof(int));
+            var body = Expression.Add(p1, Expression.Block(
+                new Expression[] {
+                    Expression.Call(typeof(System.Console).GetMethod("WriteLine", new [] { typeof(int) }), p2),
+                    p2,
+                }));
+            var lambda = Expression.Lambda<Func<int, int, int>>(body, p1, p2);
+
+            var script = lambda.ToScript();
+
+            var fun = lambda.CompileWithDebugInfo();
+            var result = fun(1, 2);
+            System.Console.WriteLine(result);
+        }
+    }
+}