Removing passing TargetFramework separately as it's part of context

aspnet · Sep 22, 2015 · 7168520 · 7168520
1 parent 1f1ccd3
commit 7168520
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/Microsoft.Dnx.Host.Clr/RuntimeBootstrapper.cs b/src/Microsoft.Dnx.Host.Clr/RuntimeBootstrapper.cs
@@ -13,9 +13,9 @@ public static int Execute(string[] argv, FrameworkName targetFramework, DomainMa
             var bootstrapperType = bootstrapperContext.GetType().Assembly.GetType("Microsoft.Dnx.Host.RuntimeBootstrapper");
 
             var executeMethodInfo = bootstrapperType.GetMethod("Execute", BindingFlags.Static | BindingFlags.Public, null,
-                    new[] { typeof(string[]), typeof(FrameworkName), bootstrapperContext.GetType() }, null);
+                    new[] { typeof(string[]), bootstrapperContext.GetType() }, null);
 
-            return (int)executeMethodInfo.Invoke(null, new object[] { argv, targetFramework, null });
+            return (int)executeMethodInfo.Invoke(null, new object[] { argv, bootstrapperContext });
         }
 
         private static object GetBootstrapperContext(FrameworkName targetFramework, DomainManager.ApplicationMainInfo info)

diff --git a/src/Microsoft.Dnx.Host.CoreClr/DomainManager.cs b/src/Microsoft.Dnx.Host.CoreClr/DomainManager.cs
@@ -49,10 +49,7 @@ unsafe static int Execute(int argc, char** argv, NativeBootstrapperContext* cont
             bootstrapperContext.TargetFramework = new FrameworkName(FrameworkNames.LongNames.DnxCore, new Version(5, 0));
             bootstrapperContext.HandleExceptions = context->HandleExceptions;
 
-            return RuntimeBootstrapper.Execute(
-                arguments,
-                bootstrapperContext.TargetFramework,
-                bootstrapperContext);
+            return RuntimeBootstrapper.Execute(arguments, bootstrapperContext);
         }
         catch (Exception ex)
         {

diff --git a/src/Microsoft.Dnx.Host.Mono/EntryPoint.cs b/src/Microsoft.Dnx.Host.Mono/EntryPoint.cs
@@ -85,14 +85,12 @@ public static int Main(string[] arguments)
             Architecture = architecture,
             RuntimeDirectory = Path.GetDirectoryName(typeof(EntryPoint).Assembly.Location),
             ApplicationBase = appbaseIndex >= 0 && (appbaseIndex < arguments.Length - 1) ? arguments[appbaseIndex + 1] : Directory.GetCurrentDirectory(),
+            // NOTE(anurse): Mono is always "dnx451" (for now).
             TargetFramework = new FrameworkName("DNX", new Version(4, 5, 1)),
             HandleExceptions = true
         };
 
-        return RuntimeBootstrapper.Execute(arguments,
-            // NOTE(anurse): Mono is always "dnx451" (for now).
-            new FrameworkName("DNX", new Version(4, 5, 1)),
-            bootstrapperContext);
+        return RuntimeBootstrapper.Execute(arguments, bootstrapperContext);
     }
 
     private static string[] ExpandCommandLineArguments(string[] arguments)

diff --git a/src/Microsoft.Dnx.Host/RuntimeBootstrapper.cs b/src/Microsoft.Dnx.Host/RuntimeBootstrapper.cs
@@ -16,14 +16,14 @@ public static class RuntimeBootstrapper
     {
         private static readonly char[] _libPathSeparator = new[] { ';' };
 
-        public static int Execute(string[] args, FrameworkName targetFramework, BootstrapperContext context)
+        public static int Execute(string[] args, BootstrapperContext bootstrapperContext)
         {
             // If we're a console host then print exceptions to stderr
             var printExceptionsToStdError = Environment.GetEnvironmentVariable(EnvironmentNames.ConsoleHost) == "1";
 
             try
             {
-                return ExecuteAsync(args, targetFramework).GetAwaiter().GetResult();
+                return ExecuteAsync(args, bootstrapperContext).GetAwaiter().GetResult();
             }
             catch (Exception ex)
             {
@@ -65,7 +65,7 @@ private static void PrintErrors(Exception ex)
             }
         }
 
-        public static Task<int> ExecuteAsync(string[] args, FrameworkName targetFramework)
+        public static Task<int> ExecuteAsync(string[] args, BootstrapperContext bootstrapperContext)
         {
             var app = new CommandLineApplication(throwOnUnexpectedArg: false);
             app.Name = Constants.BootstrapperExeName;
@@ -157,7 +157,7 @@ public static Task<int> ExecuteAsync(string[] args, FrameworkName targetFramewor
             IEnumerable<string> searchPaths = ResolveSearchPaths(optionLib.Values, app.RemainingArguments);
 
             var bootstrapper = new Bootstrapper(searchPaths);
-            return bootstrapper.RunAsync(app.RemainingArguments, env, targetFramework);
+            return bootstrapper.RunAsync(app.RemainingArguments, env, bootstrapperContext.TargetFramework);
         }
 
         private static IEnumerable<string> ResolveSearchPaths(List<string> libPaths, List<string> remainingArgs)