Add a "runtime" option

Author: mrahhal

src/Migrator.EF6.Tools/CommonConfiguration.cs

@@ -17,6 +17,7 @@ public CommonConfiguration(CommandLineApplication command)
 		public CommandOption ConnectionString { get; set; }
 		public CommandOption ProviderName { get; set; }
 		public CommandOption Context { get; set; }
+		public CommandOption Runtime { get; set; }
 
 		public CommonConfiguration AddConnectionStringOption()
 		{
@@ -34,6 +35,13 @@ public CommonConfiguration AddProviderNameOption()
 			return this;
 		}
 
+		public CommonConfiguration AddContextAndRuntimeOptions()
+		{
+			return
+				AddContextOption()
+				.AddRuntimeOption();
+		}
+
 		public CommonConfiguration AddContextOption()
 		{
 			Context = _command.Option(
@@ -42,6 +50,14 @@ public CommonConfiguration AddContextOption()
 			return this;
 		}
 
+		public CommonConfiguration AddRuntimeOption()
+		{
+			Runtime = _command.Option(
+				"-r|--runtime <runtime>",
+				"The runtime to use.");
+			return this;
+		}
+
 		public Executor CreateExecutor()
 		{
 			return new Executor(

src/Migrator.EF6.Tools/DatabaseCommand.cs

@@ -32,7 +32,7 @@ private void ConfigureInternal(CommandLineApplication command)
 					var common = Common(update)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					var force = update.Option(
 						"--force",
@@ -55,7 +55,7 @@ private void ConfigureInternal(CommandLineApplication command)
 					var common = Common(truncate)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					truncate.OnExecute(() =>
 					{
@@ -73,7 +73,7 @@ private void ConfigureInternal(CommandLineApplication command)
 					var common = Common(recreate)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					recreate.OnExecute(() =>
 					{

src/Migrator.EF6.Tools/MigrationsCommand.cs

@@ -30,7 +30,7 @@ private void ConfigureInternal(CommandLineApplication command)
 						"The directory (and sub-namespace) to use. If omitted, \"Migrations\" is used. Relative paths are relative the directory in which the command is executed.");
 
 					var common = Common(enable)
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					enable.OnExecute(() =>
 					{
@@ -52,7 +52,7 @@ private void ConfigureInternal(CommandLineApplication command)
 					var common = Common(add)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					var outputDir = add.Option(
 						"-o|--output-dir <path>",
@@ -96,7 +96,7 @@ private void ConfigureInternal(CommandLineApplication command)
 					var common = Common(script)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 					var output = script.Option(
 						"-o|--output <file>",
@@ -127,7 +127,7 @@ private void ConfigureInternal(CommandLineApplication command)
 				   var common = Common(list)
 						.AddConnectionStringOption()
 						.AddProviderNameOption()
-						.AddContextOption();
+						.AddContextAndRuntimeOptions();
 
 				   list.OnExecute(() =>
 				   {

src/Migrator.EF6.Tools/Program.cs

@@ -59,8 +59,9 @@ private static void Dispatch(string[] args)
 			}
 			Console.WriteLine();
 
-			var toolPath = Path.Combine(projectFile.ProjectDirectory, "bin", "Debug", framework.TFM, "dotnet-ef.exe");
-			var assemblyPath = Path.Combine(projectFile.ProjectDirectory, "bin", "Debug", framework.TFM, projectFile.Name + ".exe");
+			var runtime = GetRuntimeOption(args) ?? string.Empty;
+			var toolPath = Path.Combine(projectFile.ProjectDirectory, "bin", "Debug", framework.TFM, runtime, "dotnet-ef.exe");
+			var assemblyPath = Path.Combine(projectFile.ProjectDirectory, "bin", "Debug", framework.TFM, runtime, projectFile.Name + ".exe");
 
 			var dispatchCommand = DotnetToolDispatcher.CreateDispatchCommand(
 				toolPath,
@@ -86,6 +87,23 @@ private static void Dispatch(string[] args)
 			}
 		}
 
+		private static string GetRuntimeOption(string[] args)
+		{
+			var argsList = args.ToList();
+			var index = argsList.IndexOf("--runtime");
+			if (index < 0)
+			{
+				index = argsList.IndexOf("-r");
+			}
+
+			if (index < 0 || index + 1 >= args.Length)
+			{
+				return null;
+			}
+
+			return args[index + 1];
+		}
+
 		private static bool TryResolveFramework(
 			IEnumerable<TargetNuGetFramework> availableFrameworks,
 			out TargetNuGetFramework resolvedFramework)