mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Adding support to pass remaining arguments to the REPL environment.

Browse source
This commit is contained in:
Tanner Gooding 2015-12-29 15:46:45 -08:00
parent e03bc6f984
commit 0ecbc6ea9a
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Microsoft.DotNet.Tools.Repl.Csi/Program.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tools.Repl.Csi
{ {
DebugHelper.HandleDebugSwitch(ref args); DebugHelper.HandleDebugSwitch(ref args);
var app = new CommandLineApplication(); var app = new CommandLineApplication(throwOnUnexpectedArg: false);
app.Name = "dotnet repl csi"; app.Name = "dotnet repl csi";
app.FullName = "C# REPL"; app.FullName = "C# REPL";
app.Description = "C# REPL for the .NET platform"; app.Description = "C# REPL for the .NET platform";
@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Tools.Repl.Csi
var preserveTemporary = app.Option("-t|--preserve-temporary", "Preserve the temporary directory containing the compiled project.", CommandOptionType.NoValue); var preserveTemporary = app.Option("-t|--preserve-temporary", "Preserve the temporary directory containing the compiled project.", CommandOptionType.NoValue);
var project = app.Option("-p|--project <PROJECT>", "The path to the project to run. Can be a path to a project.json or a project directory", CommandOptionType.SingleValue); var project = app.Option("-p|--project <PROJECT>", "The path to the project to run. Can be a path to a project.json or a project directory", CommandOptionType.SingleValue);
app.OnExecute(() => Run(script.Value, framework.Values, configuration.Value(), preserveTemporary.HasValue(), project.Value())); app.OnExecute(() => Run(script.Value, framework.Values, configuration.Value(), preserveTemporary.HasValue(), project.Value(), app.RemainingArguments));
return app.Execute(args); return app.Execute(args);
} }
@ -104,7 +104,7 @@ namespace Microsoft.DotNet.Tools.Repl.Csi
return projectResponseFilePath; return projectResponseFilePath;
} }
private static int Run(string script, IEnumerable<string> targetFrameworks, string buildConfiguration, bool preserveTemporaryOutput, string projectPath) private static int Run(string script, IEnumerable<string> targetFrameworks, string buildConfiguration, bool preserveTemporaryOutput, string projectPath, IEnumerable<string> remainingArguments)
{ {
var corerun = Path.Combine(AppContext.BaseDirectory, Constants.HostExecutableName); var corerun = Path.Combine(AppContext.BaseDirectory, Constants.HostExecutableName);
var csiExe = Path.Combine(AppContext.BaseDirectory, "csi.exe"); var csiExe = Path.Combine(AppContext.BaseDirectory, "csi.exe");
@ -137,7 +137,19 @@ namespace Microsoft.DotNet.Tools.Repl.Csi
csiArgs.Append($"@\"{responseFile}\" "); csiArgs.Append($"@\"{responseFile}\" ");
} }
csiArgs.Append(string.IsNullOrEmpty(script) ? "-i" : script); if (string.IsNullOrEmpty(script) && !remainingArguments.Any())
{
csiArgs.Append("-i");
}
else
{
csiArgs.Append(script);
}
foreach (string remainingArgument in remainingArguments)
{
csiArgs.Append($" {remainingArgument}");
}
var result = Command.Create(csiExe, csiArgs.ToString()) var result = Command.Create(csiExe, csiArgs.ToString())
.ForwardStdOut() .ForwardStdOut()