From 9ee4821148c181fa90597ba9574d8ea4a943641f Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 12 Jul 2020 17:09:32 +1000
Subject: [PATCH] Replace dynamic type w/ casts in CoreInventory/CLP

dynamic introduced in cc9d7df9f
---
 .../BizHawk.Emulation.Cores.csproj             |  1 -
 src/BizHawk.Emulation.Cores/CoreInventory.cs   |  6 ++----
 .../CoreLoadParameters.cs                      | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 9da7006f0a..38d9a30907 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -5,7 +5,6 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="System.Memory" Version="4.5.4" />
 		<Reference Include="FlatBuffers.Core" HintPath="$(ProjectDir)../../References/FlatBuffers.Core.dll" Private="true" />
 		<Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" />
diff --git a/src/BizHawk.Emulation.Cores/CoreInventory.cs b/src/BizHawk.Emulation.Cores/CoreInventory.cs
index 0855022b83..a147e20615 100644
--- a/src/BizHawk.Emulation.Cores/CoreInventory.cs
+++ b/src/BizHawk.Emulation.Cores/CoreInventory.cs
@@ -113,13 +113,11 @@ namespace BizHawk.Emulation.Cores
 			{
 				if (_useCoreLoadParameters)
 				{
-					var paramType = typeof(CoreLoadParameters<,>).MakeGenericType(new[] { SettingsType, SyncSettingsType });
 					// TODO: clean this up
-					dynamic param = Activator.CreateInstance(paramType);
+					var param = (ICoreLoadParameters<object, object>) Activator.CreateInstance(typeof(CoreLoadParameters<,>).MakeGenericType(SettingsType, SyncSettingsType));
 					param.Comm = comm;
 					param.Game = game;
-					param.Settings = (dynamic)settings;
-					param.SyncSettings = (dynamic)syncSettings;
+					param.PutSettings(settings, syncSettings);
 					param.Roms.Add(new RomGameFake
 					{
 						RomData = rom,
diff --git a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
index 085c6955d5..0ff7f2b7c5 100644
--- a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
+++ b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using BizHawk.Emulation.Common;
@@ -17,7 +18,15 @@ namespace BizHawk.Emulation.Cores
 		DiscType DiscType { get; }
 		public string DiscName { get; set; }
 	}
-	public class CoreLoadParameters<TSettiing, TSync>
+	internal interface ICoreLoadParameters<in TSettiing, in TSync>
+	{
+		CoreComm Comm { set; }
+		GameInfo Game { set; }
+		List<IRomGame> Roms { get; }
+		bool DeterministicEmulationRequested { set; }
+		void PutSettings(object settings, object syncSettings);
+	}
+	public class CoreLoadParameters<TSettiing, TSync> : ICoreLoadParameters<TSettiing, TSync>
 	{
 		public CoreComm Comm { get; set; }
 		public GameInfo Game { get; set; }
@@ -41,5 +50,12 @@ namespace BizHawk.Emulation.Cores
 		/// <value></value>
 		public List<IDiscGame> Discs { get; set; } = new List<IDiscGame>();
 		public bool DeterministicEmulationRequested { get; set; }
+		void ICoreLoadParameters<TSettiing, TSync>.PutSettings(object settings, object syncSettings)
+		{
+			if (!(settings is TSettiing typedSettings)) throw new ArgumentException("type does not match type param", nameof(settings));
+			if (!(syncSettings is TSync typedSyncSettings)) throw new ArgumentException("type does not match type param", nameof(syncSettings));
+			Settings = typedSettings;
+			SyncSettings = typedSyncSettings;
+		}
 	}
 }