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

Merge pull request #162 from cston/repl

Browse source 
Rename 'dotnet interactive' to 'dotnet repl'
This commit is contained in:
Charles Stoner 2015-11-06 19:31:14 -08:00
commit d244b07dc5
9 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Microsoft.DotNet.Cli.sln
View file

@ -34,9 +34,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dnxhost", "dnxhost", "{0773
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler.Csc", "src\Microsoft.DotNet.Tools.Compiler.Csc\Microsoft.DotNet.Tools.Compiler.Csc.xproj", "{B559378C-FC03-45FA-893C-71784F28E0A2}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Interactive", "src\Microsoft.DotNet.Tools.Interactive\Microsoft.DotNet.Tools.Interactive.xproj", "{B317356C-99DE-499E-8B4D-D6BEC5DA57D5}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Repl", "src\Microsoft.DotNet.Tools.Repl\Microsoft.DotNet.Tools.Repl.xproj", "{B317356C-99DE-499E-8B4D-D6BEC5DA57D5}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Interactive.Csi", "src\Microsoft.DotNet.Tools.Interactive.Csi\Microsoft.DotNet.Tools.Interactive.Csi.xproj", "{717A4ED9-8897-492F-BD0C-230FCAEA9237}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Repl.Csi", "src\Microsoft.DotNet.Tools.Repl.Csi\Microsoft.DotNet.Tools.Repl.Csi.xproj", "{717A4ED9-8897-492F-BD0C-230FCAEA9237}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Resgen", "src\Microsoft.DotNet.Tools.Resgen\Microsoft.DotNet.Tools.Resgen.xproj", "{585FC6F6-48E0-4EA5-8015-0264614E97C0}"
EndProject

16
scripts/bootstrap.cmd
View file

@ -62,12 +62,12 @@ echo Building stage1 dotnet-compile-csc.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE1_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler.Csc"
if errorlevel 1 goto fail
echo Building stage1 dotnet-interactive.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE1_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Interactive"
echo Building stage1 dotnet-repl.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE1_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Repl"
if errorlevel 1 goto fail
echo Building stage1 dotnet-interactive-csi.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE1_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Interactive.Csi"
echo Building stage1 dotnet-repl-csi.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE1_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Repl.Csi"
if errorlevel 1 goto fail
echo Building stage1 dotnet-publish.exe ...
@ -107,12 +107,12 @@ echo Building stage2 dotnet-compile-csc.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE2_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Compiler.Csc"
if errorlevel 1 goto fail
echo Building stage2 dotnet-interactive.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE2_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Interactive"
echo Building stage2 dotnet-repl.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE2_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Repl"
if errorlevel 1 goto fail
echo Building stage2 dotnet-interactive-csi.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE2_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Interactive.Csi"
echo Building stage2 dotnet-repl-csi.exe ...
dotnet publish --framework "%TFM%" --runtime "%RID%" --output "%STAGE2_DIR%" --configuration "%CONFIGURATION%" "%REPOROOT%\src\Microsoft.DotNet.Tools.Repl.Csi"
if errorlevel 1 goto fail
echo Building stage2 dotnet-publish.exe ...

2
src/Microsoft.DotNet.Tools.Interactive.Csi/Microsoft.DotNet.Tools.Interactive.Csi.xproj → src/Microsoft.DotNet.Tools.Repl.Csi/Microsoft.DotNet.Tools.Repl.Csi.xproj
View file

@ -8,7 +8,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>717a4ed9-8897-492f-bd0c-230fcaea9237</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Interactive.Csi</RootNamespace>
<RootNamespace>Microsoft.DotNet.Tools.Repl.Csi</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

8
src/Microsoft.DotNet.Tools.Interactive.Csi/Program.cs → src/Microsoft.DotNet.Tools.Repl.Csi/Program.cs
View file

@ -3,7 +3,7 @@ using System.IO;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Interactive.Csi
namespace Microsoft.DotNet.Tools.Repl.Csi
{
public sealed class Program
{
@ -12,9 +12,9 @@ namespace Microsoft.DotNet.Tools.Interactive.Csi
DebugHelper.HandleDebugSwitch(ref args);
var app = new CommandLineApplication();
app.Name = "dotnet interactive csi";
app.FullName = "CSharp Interactive";
app.Description = "CSharp Interactive for the .NET platform";
app.Name = "dotnet repl csi";
app.FullName = "C# REPL";
app.Description = "C# REPL for the .NET platform";
app.HelpOption("-h|--help");
var script = app.Argument("<SCRIPT>", "The .csx file to run. Defaults to interactive mode.");

2
src/Microsoft.DotNet.Tools.Interactive.Csi/project.json → src/Microsoft.DotNet.Tools.Repl.Csi/project.json
View file

@ -1,5 +1,5 @@
{
"name": "dotnet-interactive-csi",
"name": "dotnet-repl-csi",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true

2
src/Microsoft.DotNet.Tools.Interactive/Microsoft.DotNet.Tools.Interactive.xproj → src/Microsoft.DotNet.Tools.Repl/Microsoft.DotNet.Tools.Repl.xproj
View file

@ -8,7 +8,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b317356c-99de-499e-8b4d-d6bec5da57d5</ProjectGuid>
<RootNamespace>Microsoft.DotNet.Tools.Interactive</RootNamespace>
<RootNamespace>Microsoft.DotNet.Tools.Repl</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

14
src/Microsoft.DotNet.Tools.Interactive/Program.cs → src/Microsoft.DotNet.Tools.Repl/Program.cs
View file

@ -2,7 +2,7 @@
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Interactive
namespace Microsoft.DotNet.Tools.Repl
{
public sealed class Program
{
@ -11,9 +11,9 @@ namespace Microsoft.DotNet.Tools.Interactive
DebugHelper.HandleDebugSwitch(ref args);
var app = new CommandLineApplication();
app.Name = "dotnet interactive";
app.FullName = ".NET interactive";
app.Description = "Interactive for the .NET platform";
app.Name = "dotnet repl";
app.FullName = ".NET interactive REPL";
app.Description = "Interactive REPL for the .NET platform";
app.HelpOption("-h|--help");
var language = app.Argument("<LANGUAGE>", "The interactive programming language, defaults to csharp");
@ -23,17 +23,17 @@ namespace Microsoft.DotNet.Tools.Interactive
private static int Run(string languageOpt)
{
string interactiveName;
string replName;
if ((languageOpt == null) || (languageOpt == "csharp"))
{
interactiveName = "csi";
replName = "csi";
}
else
{
Reporter.Error.WriteLine($"Unrecognized language: {languageOpt}".Red());
return -1;
}
var command = Command.Create($"dotnet-interactive-{interactiveName}", string.Empty)
var command = Command.Create($"dotnet-repl-{replName}", string.Empty)
.ForwardStdOut()
.ForwardStdErr();
var result = command.Execute();

2
src/Microsoft.DotNet.Tools.Interactive/project.json → src/Microsoft.DotNet.Tools.Repl/project.json
View file

@ -1,5 +1,5 @@
{
"name": "dotnet-interactive",
"name": "dotnet-repl",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true

2
src/Microsoft.DotNet.Tools.Run/Program.cs
View file

@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Tools.Run
private static int RunInteractive(string scriptName)
{
var command = Command.Create($"dotnet-interactive-csi", scriptName)
var command = Command.Create($"dotnet-repl-csi", scriptName)
.ForwardStdOut()
.ForwardStdErr();
var result = command.Execute();