From 1470d4b1cc62a3cb7989c510b4f74f84647212f1 Mon Sep 17 00:00:00 2001
From: Rick van Dam <Barsonax@users.noreply.github.com>
Date: Tue, 30 Jun 2020 17:25:30 +0200
Subject: [PATCH] fix working folder being wrong in serialization benchmark

---
 .../DualityBenchmarks/DualityBenchmarks.csproj       |  2 ++
 Benchmarks/DualityBenchmarks/Program.cs              |  3 ++-
 Benchmarks/DualityBenchmarks/SerializerBenchmarks.cs | 12 ++++--------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Benchmarks/DualityBenchmarks/DualityBenchmarks.csproj b/Benchmarks/DualityBenchmarks/DualityBenchmarks.csproj
index 548a007d1..edd40c910 100644
--- a/Benchmarks/DualityBenchmarks/DualityBenchmarks.csproj
+++ b/Benchmarks/DualityBenchmarks/DualityBenchmarks.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net472</TargetFramework>
+    <OutputPath>$(RootFolder)Build\Output\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Benchmarks/DualityBenchmarks/Program.cs b/Benchmarks/DualityBenchmarks/Program.cs
index c3a8ced89..5c7f16b88 100644
--- a/Benchmarks/DualityBenchmarks/Program.cs
+++ b/Benchmarks/DualityBenchmarks/Program.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Validators;
 
 namespace DualityBenchmarks
 {
@@ -14,7 +15,7 @@ static void Main(string[] args)
 				Console.ForegroundColor = ConsoleColor.Yellow;
 				Console.WriteLine($"[WARNING] Running with debugger attached, using {nameof(DebugInProcessConfig)} this might affect benchmark results!");
 				Console.ResetColor();
-				BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
+				BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig().AddValidator(ExecutionValidator.FailOnError));
 			}
 			else {
 				BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
diff --git a/Benchmarks/DualityBenchmarks/SerializerBenchmarks.cs b/Benchmarks/DualityBenchmarks/SerializerBenchmarks.cs
index e55bdcdb8..37c003aa9 100644
--- a/Benchmarks/DualityBenchmarks/SerializerBenchmarks.cs
+++ b/Benchmarks/DualityBenchmarks/SerializerBenchmarks.cs
@@ -3,8 +3,6 @@
 using Duality.Tests.Serialization;
 using Duality.Serialization;
 using BenchmarkDotNet.Attributes;
-using Duality;
-using Duality.Backend;
 using Duality.Launcher;
 
 namespace DualityBenchmarks
@@ -21,14 +19,12 @@ public class SerializerBenchmarks
 		private byte[] readData;
 		private TestObject data;
 
+		private DualityLauncher launcher;
+
 		[GlobalSetup]
 		public void Setup()
 		{
-			DualityApp.Init(
-				DualityApp.ExecutionEnvironment.Launcher,
-				DualityApp.ExecutionContext.Game,
-				new DefaultAssemblyLoader(),
-				new LauncherArgs());
+			this.launcher = new DualityLauncher();
 
 			this.results = new TestObject[this.N];
 			this.data = new TestObject(new Random(0), 5);
@@ -39,7 +35,7 @@ public void Setup()
 		[GlobalCleanup]
 		public void Cleanup()
 		{
-			DualityApp.Terminate();
+			this.launcher.Dispose();
 		}
 
 		[Benchmark]