add support for passing in runtime ID when doing publish to exe

filipw · filipw · commit ecf9e3dfedac · 2018-06-22T13:00:29.000+02:00
diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -57,7 +57,7 @@ public void CreateAssembly<TReturn, THost>(ScriptContext context, LogFactory log
             File.Copy(sourceNugetPropsPath, destinationNugetPropsPath, overwrite: true);
         }
 
-        public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory logFactory)
+        public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory logFactory, string runtimeIdentifier = null)
         {
             const string AssemblyName = "scriptAssembly";
 
@@ -73,11 +73,11 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
 
             CopyProgramTemplate(tempProjectDirecory);
 
-            var runtimeIdentifier = _scriptEnvironment.RuntimeIdentifier;
+            runtimeIdentifier = runtimeIdentifier ?? _scriptEnvironment.RuntimeIdentifier;
 
             var commandRunner = new CommandRunner(logFactory);
             // todo: may want to add ability to return dotnet.exe errors
-            var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {context.WorkingDirectory}");
+            var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {Path.Combine(context.WorkingDirectory, runtimeIdentifier)}");
             if (exitcode != 0) throw new Exception($"dotnet publish failed with result '{exitcode}'");
         }
 
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
@@ -138,6 +138,8 @@ private static int Wain(string[] args)
                 var dllOption = c.Option("--dll", "Publish to a .dll instead of a .exe", CommandOptionType.NoValue);
                 var commandConfig = c.Option("-c | --configuration <configuration>", "Configuration to use for running the script [Release/Debug] Default is \"Debug\"", CommandOptionType.SingleValue);
                 var publishDebugMode = c.Option(DebugFlagShort + " | " + DebugFlagLong, "Enables debug output.", CommandOptionType.NoValue);
+                var runtime = c.Option("-r |--runtime", "The runtime to publish the self contained EXE to. Defaults to the your current platform.", CommandOptionType.SingleValue);
+
                 c.OnExecute(() =>
                 {
                     if (fileNameArgument.Value == null)
@@ -163,9 +165,13 @@ private static int Wain(string[] args)
                     var context = new ScriptContext(code, absolutePublishDirectory, Enumerable.Empty<string>(), absoluteFilePath, optimizationLevel);
 
                     if (dllOption.HasValue())
+                    {
                         publisher.CreateAssembly<int, CommandLineScriptGlobals>(context, logFactory, dllName.Value());
+                    }
                     else
-                        publisher.CreateExecutable<int, CommandLineScriptGlobals>(context, logFactory);
+                    {
+                        publisher.CreateExecutable<int, CommandLineScriptGlobals>(context, logFactory, runtime.Value());
+                    }
 
                     return 0;
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void CreateAssembly<TReturn, THost>(ScriptContext context, LogFactory log`
`57`	`57`	`File.Copy(sourceNugetPropsPath, destinationNugetPropsPath, overwrite: true);`
`58`	`58`	`}`
`59`	`59`
`60`		`- public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory logFactory)`
	`60`	`+ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory logFactory, string runtimeIdentifier = null)`
`61`	`61`	`{`
`62`	`62`	`const string AssemblyName = "scriptAssembly";`
`63`	`63`
`@@ -73,11 +73,11 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l`
`73`	`73`
`74`	`74`	`CopyProgramTemplate(tempProjectDirecory);`
`75`	`75`
`76`		`- var runtimeIdentifier = _scriptEnvironment.RuntimeIdentifier;`
	`76`	`+ runtimeIdentifier = runtimeIdentifier ?? _scriptEnvironment.RuntimeIdentifier;`
`77`	`77`
`78`	`78`	`var commandRunner = new CommandRunner(logFactory);`
`79`	`79`	`// todo: may want to add ability to return dotnet.exe errors`
`80`		`- var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {context.WorkingDirectory}");`
	`80`	`+ var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {Path.Combine(context.WorkingDirectory, runtimeIdentifier)}");`
`81`	`81`	`if (exitcode != 0) throw new Exception($"dotnet publish failed with result '{exitcode}'");`
`82`	`82`	`}`
`83`	`83`