Fixed Warnings

This commit is contained in:
Matthias Heil
2026-04-05 08:00:09 +02:00
parent dfb879bfb3
commit 511a5f9f51
21 changed files with 104 additions and 115 deletions
@@ -32,13 +32,11 @@ public partial class App : Application
#endregion
#region Fields
private IHost? _host;
private CancellationTokenSource? _cancellationTokenSource;
#endregion
private IHost? Host {get; set;}
private CancellationTokenSource? CancellationTokenSource { get; set;}
#region Methods
public override void OnFrameworkInitializationCompleted()
@@ -51,7 +49,7 @@ public partial class App : Application
// catch all unhandled errors
AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
HostApplicationBuilder builder = Host.CreateApplicationBuilder();
HostApplicationBuilder builder = Microsoft.Extensions.Hosting.Host.CreateApplicationBuilder();
builder
// Register the Random Logging Service
@@ -77,7 +75,7 @@ public partial class App : Application
{
Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(builder.Configuration)
.WriteTo.DataStoreLoggerSink( dataStoreProvider: () => _host!.Services.TryGetService<ILogDataStore>()!,formatProvider: CultureInfo.InvariantCulture)
.WriteTo.DataStoreLoggerSink( dataStoreProvider: () => Host!.Services.TryGetService<ILogDataStore>()!,formatProvider: CultureInfo.InvariantCulture)
.CreateLogger();
cfg.ClearProviders().AddSerilog(Log.Logger);
@@ -90,19 +88,19 @@ public partial class App : Application
DataContext = service.GetRequiredService<MainViewModel>()
});
_host = builder.Build();
_cancellationTokenSource = new();
Host = builder.Build();
CancellationTokenSource = new();
try
{
LogStartingMode();
// set and show
desktop.MainWindow = _host.Services.GetRequiredService<MainWindow>();
desktop.MainWindow = Host.Services.GetRequiredService<MainWindow>();
desktop.ShutdownRequested += OnShutdownRequested;
// startup background services
_ = _host.StartAsync(_cancellationTokenSource.Token);
_ = Host.StartAsync(CancellationTokenSource.Token);
}
catch (OperationCanceledException)
{
@@ -162,7 +160,7 @@ public partial class App : Application
StringComparison.OrdinalIgnoreCase);
// initialize a logger & EventId
ILogger<App> logger = _host!.Services.GetRequiredService<ILogger<App>>();
ILogger<App> logger = Host!.Services.GetRequiredService<ILogger<App>>();
EventId eventId = new(id: 0, name: Assembly.GetEntryAssembly()!.GetName().Name);
// log a test pattern for each log level
@@ -175,7 +173,7 @@ public partial class App : Application
private void CleanUp()
{
// tell the background services that we are shutting down
_ = _host?.StopAsync(_cancellationTokenSource?.Token ?? CancellationToken.None);
_ = Host?.StopAsync(CancellationTokenSource?.Token ?? CancellationToken.None);
// flush logs
Log.CloseAndFlush();
@@ -3,7 +3,7 @@ using System;
namespace AvaloniaSerilogDI;
internal class Program
internal sealed class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
@@ -10,8 +10,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Title="C# AVALONIA SeriLog | LogViewer Control Example - Dot Net 7.0"
Icon="/Assets/avalonia-logo.ico"
Title="AvaloniaLoggingDI-Serilog"
Icon="/Assets/avalonia-logo.ico"
WindowStartupLocation="CenterScreen" Height="634" Width="600">
<control:LogViewerControl DataContext="{Binding LogViewer}" />