Skip to content

Commit bcb4161

Browse files
committed
prepare release 1.0.8
1 parent 666c517 commit bcb4161

25 files changed

+1503
-475
lines changed

OrbitalShell-CLI/OrbitalShell-CLI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
5454
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5555
<Optimize>false</Optimize>
56+
<DocumentationFile>bin/Debug/net5.0/orbsh.xml</DocumentationFile>
5657
</PropertyGroup>
5758

5859

OrbitalShell-CLI/Shell.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Shell
1111
{
1212
public static int Startup(IServiceProvider serviceProvider,string[] args)
1313
{
14-
var cons = serviceProvider.GetRequiredService<IDotNetConsole>();
14+
var cons = serviceProvider.GetRequiredService<IConsole>();
1515

1616
// 2. build a clp
1717

OrbitalShell-ConsoleApp/App.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static IHostBuilder InitializeServices(string[] args = null)
2929
hosting.Host
3030
.CreateDefaultBuilder(args)
3131
.ConfigureServices((_, services) =>
32-
services.AddSingleton<IDotNetConsole,Console>());
32+
services.AddSingleton<IConsole,Console>());
3333
return HostBuilder;
3434
}
3535

OrbitalShell-ConsoleApp/Component/Console/ColorSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ namespace OrbitalShell.Component.Console
44
{
55
public class ColorSettings
66
{
7-
IDotNetConsole Console;
7+
IConsole Console;
88

9-
public ColorSettings(IDotNetConsole console)
9+
public ColorSettings(IConsole console)
1010
{
1111
Console = console;
1212
}

OrbitalShell-ConsoleApp/Component/Console/ConsoleTextWriterWrapper.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ConsoleTextWriterWrapper : TextWriterWrapper
2222

2323
public bool RedirecToErr = false;
2424

25-
public IDotNetConsole Console;
25+
public IConsole Console;
2626

2727
public ColorSettings ColorSettings;
2828

@@ -71,18 +71,18 @@ public string LNBRK
7171

7272
#region init
7373

74-
public ConsoleTextWriterWrapper(IDotNetConsole console) : base() { Init(console); }
74+
public ConsoleTextWriterWrapper(IConsole console) : base() { Init(console); }
7575

76-
public ConsoleTextWriterWrapper(IDotNetConsole console,TextWriter textWriter) : base(textWriter) { Init(console); }
76+
public ConsoleTextWriterWrapper(IConsole console,TextWriter textWriter) : base(textWriter) { Init(console); }
7777

78-
public ConsoleTextWriterWrapper(IDotNetConsole console,CSharpScriptEngine cSharpScriptEngine) : base() { Init(console,cSharpScriptEngine); }
78+
public ConsoleTextWriterWrapper(IConsole console,CSharpScriptEngine cSharpScriptEngine) : base() { Init(console,cSharpScriptEngine); }
7979

80-
public ConsoleTextWriterWrapper(IDotNetConsole console,TextWriter textWriter, CSharpScriptEngine cSharpScriptEngine) : base(textWriter) { Init(console,cSharpScriptEngine); }
80+
public ConsoleTextWriterWrapper(IConsole console,TextWriter textWriter, CSharpScriptEngine cSharpScriptEngine) : base(textWriter) { Init(console,cSharpScriptEngine); }
8181

8282
/// <summary>
8383
/// shell init
8484
/// </summary>
85-
void Init(IDotNetConsole console,CSharpScriptEngine cSharpScriptEngine = null)
85+
void Init(IConsole console,CSharpScriptEngine cSharpScriptEngine = null)
8686
{
8787
Console = console;
8888
CSharpScriptEngine = cSharpScriptEngine ?? new CSharpScriptEngine(console);

OrbitalShell-ConsoleApp/Component/Console/EchoSequence.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class EchoSequence
1212
public readonly string Text;
1313
public int Length => LastIndex - FirstIndex + 1;
1414

15-
IDotNetConsole Console;
15+
IConsole Console;
1616

1717
public EchoSequence(
18-
IDotNetConsole console,
18+
IConsole console,
1919
EchoDirectives? printDirective,
2020
int firstIndex,
2121
int lastIndex,
@@ -32,7 +32,7 @@ public EchoSequence(
3232
}
3333

3434
public EchoSequence(
35-
IDotNetConsole console,
35+
IConsole console,
3636
string printDirective,
3737
int firstIndex,
3838
int lastIndex,

OrbitalShell-ConsoleApp/Component/Console/TextColor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class TextColor
1111
public ConsoleColor? Foreground
1212
{
1313
get {
14-
var console = App.Host.Services.GetRequiredService<IDotNetConsole>();
14+
var console = App.Host.Services.GetRequiredService<IConsole>();
1515
return _foreground.HasValue?_foreground.Value:console.DefaultForeground; }
1616
set { _foreground = value; }
1717
}
@@ -20,7 +20,7 @@ public ConsoleColor? Foreground
2020
public ConsoleColor? Background
2121
{
2222
get {
23-
var console = App.Host.Services.GetRequiredService<IDotNetConsole>();
23+
var console = App.Host.Services.GetRequiredService<IConsole>();
2424
return _background.HasValue?_background.Value:console.DefaultBackground; }
2525
set { _background = value; }
2626
}
@@ -66,7 +66,7 @@ public static ConsoleColor GetColor(string colorName)
6666
/// parse a 4 bit color
6767
/// </summary>
6868
/// <param name="c">text of color name</param>
69-
public static ConsoleColor? ParseColor(IDotNetConsole console,object c)
69+
public static ConsoleColor? ParseColor(IConsole console,object c)
7070
{
7171
if (c==null) return null;
7272
var s = (string)c;
@@ -82,7 +82,7 @@ public static ConsoleColor GetColor(string colorName)
8282
/// </summary>
8383
/// <param name="c">string representing an integer in range 0..255 (included)</param>
8484
/// <returns></returns>
85-
public static int Parse8BitColor(IDotNetConsole console, object c)
85+
public static int Parse8BitColor(IConsole console, object c)
8686
{
8787
if (int.TryParse((string)c, out int r) && r>=0 && r<=255)
8888
return r;
@@ -95,7 +95,7 @@ public static int Parse8BitColor(IDotNetConsole console, object c)
9595
/// </summary>
9696
/// <param name="c">string of format: r:g:b where 0<=r,g,b<=255</param>
9797
/// <returns></returns>
98-
public static (int r,int g,int b) Parse24BitColor(IDotNetConsole console, object c)
98+
public static (int r,int g,int b) Parse24BitColor(IConsole console, object c)
9999
{
100100
var s = (string)c;
101101
var t = s.Split(':');

OrbitalShell-ConsoleApp/Component/EchoDirective/EchoDirectiveProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class EchoDirectiveProcessor
1818
public delegate void SimpleCommandDelegate();
1919
public readonly ConsoleTextWriterWrapper Writer;
2020
public readonly CommandMap CommandMap;
21-
readonly IDotNetConsole Console;
21+
readonly IConsole Console;
2222

2323
public EchoDirectiveProcessor(
2424
ConsoleTextWriterWrapper writer,

OrbitalShell-ConsoleApp/Component/EchoDirective/Shortcuts.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace OrbitalShell.Component.EchoDirective
1313
/// </summary>
1414
public static class Shortcuts
1515
{
16-
public static IDotNetConsole Console;
16+
public static IConsole Console;
1717

18-
public static void Initialize(IDotNetConsole console) => Console = console;
18+
public static void Initialize(IConsole console) => Console = console;
1919

2020
public static string GetCmd(string cmd, string value = null)
2121
{

OrbitalShell-ConsoleApp/Component/Script/CSharpScriptEngine.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public class CSharpScriptEngine
1717

1818
public ScriptOptions DefaultScriptOptions;
1919

20-
public CSharpScriptEngine(IDotNetConsole console) { _Init(console); }
20+
public CSharpScriptEngine(IConsole console) { _Init(console); }
2121

22-
public CSharpScriptEngine(IDotNetConsole console,ScriptOptions defaultScriptOptions)
22+
public CSharpScriptEngine(IConsole console,ScriptOptions defaultScriptOptions)
2323
{
2424
DefaultScriptOptions = defaultScriptOptions;
2525
_Init(console);
2626
}
2727

28-
private void _Init(IDotNetConsole console) {
28+
private void _Init(IConsole console) {
2929

3030
DefaultScriptOptions ??= ScriptOptions.Default;
3131
DefaultScriptOptions = DefaultScriptOptions

0 commit comments

Comments
 (0)