diff --git a/src/ConsoleApp/FileTime.ConsoleUI/DI.cs b/src/ConsoleApp/FileTime.ConsoleUI/DI.cs index 93ff586..a7743e0 100644 --- a/src/ConsoleApp/FileTime.ConsoleUI/DI.cs +++ b/src/ConsoleApp/FileTime.ConsoleUI/DI.cs @@ -47,7 +47,9 @@ public static class DI #if DEBUG || VERBOSE_LOGGING .MinimumLevel.Verbose() #endif +#if DEBUG .ReadFrom.Configuration(serviceProvider.GetRequiredService()) +#endif .Enrich.FromLogContext() .WriteTo.File( Path.Combine(Program.AppDataRoot, "logs", "appLog.log"), diff --git a/src/ConsoleApp/FileTime.ConsoleUI/Program.cs b/src/ConsoleApp/FileTime.ConsoleUI/Program.cs index b6f42ef..1586f19 100644 --- a/src/ConsoleApp/FileTime.ConsoleUI/Program.cs +++ b/src/ConsoleApp/FileTime.ConsoleUI/Program.cs @@ -3,16 +3,13 @@ using FileTime.App.Core; using FileTime.App.Core.Configuration; using FileTime.ConsoleUI; using FileTime.ConsoleUI.App; -using FileTime.ConsoleUI.App.Styling; using FileTime.ConsoleUI.InfoProviders; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Serilog; using Serilog.Debugging; using TerminalUI; -using TerminalUI.Color; using TerminalUI.ConsoleDrivers; -using TerminalUI.Styling; using ITheme = FileTime.ConsoleUI.App.Styling.ITheme; Console.OutputEncoding = System.Text.Encoding.UTF8; diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj index 3828fe9..bc36fdc 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj @@ -32,7 +32,6 @@ - diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs b/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs index 190c497..07b7a87 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs @@ -90,7 +90,9 @@ public static class Startup #if DEBUG || VERBOSE_LOGGING .MinimumLevel.Verbose() #endif +#if DEBUG .ReadFrom.Configuration(serviceProvider.GetRequiredService()) +#endif .Enrich.FromLogContext() .WriteTo.File( Path.Combine(Program.AppDataRoot, "logs", "appLog.log"), diff --git a/src/Library/TerminalUI/Controls/Border.cs b/src/Library/TerminalUI/Controls/Border.cs index 5cfb224..fd92765 100644 --- a/src/Library/TerminalUI/Controls/Border.cs +++ b/src/Library/TerminalUI/Controls/Border.cs @@ -150,7 +150,7 @@ public sealed partial class Border : ContentView, T>, IDisplayView { SetStyleColor(renderContext, foregroundColor, fillColor); - // Use the same array that children use. Also use that area, so we working only inside the border + // Use the same array that children use. Also use that area, so we work only inside the border Array2DHelper.RenderEmpty( renderContext.ConsoleDriver, borderChildUpdatedCells,