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
@@ -37,7 +37,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
/*
@@ -87,24 +87,24 @@ public partial class App : Application
services
.AddSingleton<MainViewModel>()
.AddSingleton<MainWindow>(service => new MainWindow
.AddSingleton(service => new MainWindow
{
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)
{
@@ -131,14 +131,12 @@ public partial class App : Application
}
}
private void OnShutdownRequested(object? sender, ShutdownRequestedEventArgs e)
=> _ = _host!.StopAsync(_cancellationTokenSource!.Token);
=> _ = Host?.StopAsync(CancellationTokenSource!.Token);
#region Fields
private IHost? _host;
private CancellationTokenSource? _cancellationTokenSource;
private IHost? Host { get; set; }
private CancellationTokenSource? CancellationTokenSource { get; set; }
#endregion
private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
=> ShowMessageBox("Unhandled Error", ((Exception)e.ExceptionObject).Message);
@@ -161,7 +159,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 EventId(id: 0, name: Assembly.GetEntryAssembly()!.GetName().Name);
// log a test pattern for each log level
@@ -3,7 +3,7 @@ using System;
namespace AvaloniaLoggingDI;
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,7 +10,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Title="C# AVALONIA | LogViewer Control Example - Dot Net 7.0"
Title="AvaloniaLoggingDI-MsLogger"
Icon="/Assets/avalonia-logo.ico"
WindowStartupLocation="CenterScreen" Height="634" Width="600">
@@ -3,6 +3,7 @@ using System.Drawing;
using Common.Core;
using Microsoft.Extensions.Logging;
using AvaloniaLoggingNoDI.Extensions;
using System.Diagnostics;
namespace AvaloniaLoggingNoDI.Helpers;
@@ -15,8 +16,8 @@ public static class LoggingHelper
{
// retrieve the log level from 'appsettings'
string value = AppSettings<string>.Current("Logging:LogLevel", "Default") ?? "Information";
Enum.TryParse(value, out LogLevel logLevel);
var success = Enum.TryParse(value, out LogLevel logLevel);
Debug.Assert(success, $"Failed to parse log level from appsettings. Value: '{value}'");
// wire up the loggers
Factory = LoggerFactory.Create(builder => builder
@@ -3,7 +3,7 @@ using System;
namespace AvaloniaLoggingNoDI;
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,7 +10,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="C# AVALONIA MINIMAL | LogViewer Control Example - Dot Net 7.0"
Title="AvaloniaLoggingNoDI-MsLogger"
Icon="/Assets/avalonia-logo.ico"
WindowStartupLocation="CenterScreen" Height="634" Width="600">
@@ -10,7 +10,7 @@ using System.Threading;
namespace AvaloniaLoggingNoDI.Views;
public partial class MainWindow : Window, ILogDataStoreImpl
public partial class MainWindow : Window, ILogDataStoreCore
{
public MainWindow()
{
@@ -21,7 +21,7 @@ public partial class MainWindow : Window, ILogDataStoreImpl
// Get the Launch mode
bool isDevelopment = string.Equals(Environment.GetEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES"), "debug",
StringComparison.InvariantCultureIgnoreCase);
StringComparison.OrdinalIgnoreCase);
// initialize a logger & EventId
Logger<MainWindow> logger = new Logger<MainWindow>(LoggingHelper.Factory);
@@ -32,12 +32,10 @@ public partial class App : Application
#endregion
#region Fields
private IHost? _host;
private CancellationTokenSource? _cancellationTokenSource;
private IHost? Host {get; set;}
private CancellationTokenSource? CancellationTokenSource { get; set;}
#endregion
#region Methods
@@ -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,7 +10,7 @@
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"
Title="AvaloniaLoggingDI-Serilog"
Icon="/Assets/avalonia-logo.ico"
WindowStartupLocation="CenterScreen" Height="634" Width="600">
@@ -10,7 +10,7 @@
xmlns:control="clr-namespace:LogViewer.Avalonia;assembly=LogViewer.Avalonia"
Title="C# AVALONIA | SeriLog LogViewer Control Example - Dot Net 7.0"
Title="AvaloniaLoggingNoDI-SerilogLogger"
Icon="/Assets/avalonia-logo.ico"
WindowStartupLocation="CenterScreen" Height="634" Width="600">
@@ -11,7 +11,7 @@ using System.Threading;
namespace AvaloniaSerilogNoDI;
public partial class MainWindow : Window, ILogDataStoreImpl
public partial class MainWindow : Window, ILogDataStoreCore
{
#region Constructors
@@ -20,11 +20,11 @@ public partial class MainWindow : Window, ILogDataStoreImpl
InitializeComponent();
// Initialize _service and pass in the Logger
_service = new(new Logger<RandomLoggingService>(LoggingHelper.Factory));
Service = new(new Logger<RandomLoggingService>(LoggingHelper.Factory));
// Get the Launch mode
bool isDevelopment = string.Equals(Environment.GetEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES"), "debug",
StringComparison.InvariantCultureIgnoreCase);
StringComparison.OrdinalIgnoreCase);
// initialize a logger & EventId
Logger<MainWindow> logger = new Logger<MainWindow>(LoggingHelper.Factory);
@@ -37,7 +37,7 @@ public partial class MainWindow : Window, ILogDataStoreImpl
logger.Emit(eventId, LogLevel.Information, $"Running in {(isDevelopment ? "Debug" : "Release")} mode");
// Start generating log entries
_ = _service.StartAsync(CancellationToken.None);
_ = Service.StartAsync(CancellationToken.None);
// manually wire up the logging to the view ... the control will show backlog entries...
DataStore = MainControlsDataStore.DataStore;
@@ -52,11 +52,8 @@ public partial class MainWindow : Window, ILogDataStoreImpl
#endregion
#region Fields
private readonly RandomLoggingService? _service;
#endregion
private RandomLoggingService? Service { get; set;}
#region Properties
@@ -71,7 +68,7 @@ public partial class MainWindow : Window, ILogDataStoreImpl
{
Window.Closing -= OnClosing;
_ = _service?.StopAsync();
_ = Service?.StopAsync();
LoggingHelper.CloseAndFlush();
}
@@ -3,7 +3,7 @@ using System;
namespace AvaloniaSerilogNoDI;
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
@@ -164,7 +164,7 @@ public class RandomLoggingService : BackgroundService
}
_logger.Emit(GenerateEventId(), level, GetMessage(),
new Exception(_errorMessages[_random.Next(0, _errorMessages.Count)]));
new InvalidDataException(_errorMessages[_random.Next(0, _errorMessages.Count)]));
}
private EventId GenerateEventId()
@@ -13,7 +13,7 @@ public partial class LogViewerControl : UserControl
}
private ILogDataStoreImpl? vm;
private ILogDataStoreCore? vm;
private LogModel? item;
private void OnDataContextChanged(object? sender, EventArgs e)
@@ -21,7 +21,7 @@ public partial class LogViewerControl : UserControl
if (DataContext is null)
return;
vm = (ILogDataStoreImpl)DataContext;
vm = (ILogDataStoreCore)DataContext;
vm.DataStore.Entries.CollectionChanged += OnCollectionChanged;
}
+13 -19
View File
@@ -5,41 +5,35 @@ namespace Common.Core;
public class AppSettings<TOption>
{
#region Constructors
public AppSettings(IConfigurationSection configSection, string? key = null)
{
_configSection = configSection;
ConfigSection = configSection;
// ReSharper disable once VirtualMemberCallInConstructor
GetValue(key);
}
#endregion
#region Fields
protected static AppSettings<TOption>? _appSetting;
// ReSharper disable once StaticMemberInGenericType
protected static IConfigurationSection? _configSection;
#endregion
#region Properties
protected static AppSettings<TOption>? AppSetting { get; private set; }
// ReSharper disable once StaticMemberInGenericType
protected static IConfigurationSection? ConfigSection { get; private set; }
public TOption? Value { get; set; }
#endregion
#region Methods
#pragma warning disable CA1000 // Do not declare static members on generic types
public static TOption? Current(string section, string? key = null)
{
_appSetting = GetCurrentSettings(section, key);
return _appSetting.Value;
AppSetting = GetCurrentSettings(section, key);
return AppSetting.Value;
}
public static AppSettings<TOption> GetCurrentSettings(string section, string? key = null)
#pragma warning restore CA1000 // Do not declare static members on generic types
{
string env = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Production";
@@ -65,7 +59,7 @@ public class AppSettings<TOption>
{
// no key, so must be a class/strut object
Value = Activator.CreateInstance<TOption>();
_configSection!.Bind(Value);
ConfigSection!.Bind(Value);
return;
}
@@ -77,10 +71,10 @@ public class AppSettings<TOption>
optionType == typeof(decimal) ||
optionType == typeof(float) ||
optionType == typeof(double))
&& _configSection != null)
&& ConfigSection != null)
{
// we must be retrieving a value
Value = _configSection.GetValue<TOption>(key);
Value = ConfigSection.GetValue<TOption>(key);
return;
}
@@ -41,13 +41,25 @@ public static class LoggerExtensions
public static void TestPattern(this ILogger logger, EventId eventId)
{
Exception exception = new Exception("Test Error Message");
Exception exception = new InvalidDataException("Test Error Message");
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Trace, "Trace Test Pattern");
#pragma warning restore CA1848 // Use the LoggerMessage delegates
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Debug, "Debug Test Pattern");
#pragma warning restore CA1848 // Use the LoggerMessage delegates
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Information, "Information Test Pattern");
#pragma warning restore CA1848 // Use the LoggerMessage delegates
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Warning, "Warning Test Pattern");
#pragma warning restore CA1848 // Use the LoggerMessage delegates
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Error, "Error Test Pattern", exception);
#pragma warning restore CA1848 // Use the LoggerMessage delegates
#pragma warning disable CA1848 // Use the LoggerMessage delegates
logger.Emit(eventId, LogLevel.Critical, "Critical Test Pattern", exception);
#pragma warning restore CA1848 // Use the LoggerMessage delegates
}
}
@@ -1,6 +0,0 @@
namespace LogViewer.Core;
public interface ILogDataStoreImpl
{
public ILogDataStore DataStore { get; }
}
@@ -2,7 +2,7 @@
namespace LogViewer.Core.ViewModels;
public class LogViewerControlViewModel : ViewModel, ILogDataStoreImpl
public class LogViewerControlViewModel : ViewModel, ILogDataStoreCore
{
#region Constructor
@@ -12,9 +12,9 @@ public class DataStoreLoggerProvider: ILoggerProvider
public DataStoreLoggerProvider(IOptionsMonitor<DataStoreLoggerConfiguration> config, ILogDataStore dataStore)
{
_dataStore = dataStore;
DataStore = dataStore;
_currentConfig = config.CurrentValue;
_onChangeToken = config.OnChange(updatedConfig => _currentConfig = updatedConfig);
OnChangeToken = config.OnChange(updatedConfig => _currentConfig = updatedConfig);
}
#endregion
@@ -23,25 +23,26 @@ public class DataStoreLoggerProvider: ILoggerProvider
private DataStoreLoggerConfiguration _currentConfig;
private readonly IDisposable? _onChangeToken;
protected readonly ILogDataStore _dataStore;
private IDisposable? OnChangeToken { get; }
protected ILogDataStore DataStore { get; }
protected readonly ConcurrentDictionary<string, DataStoreLogger> _loggers = new();
protected ConcurrentDictionary<string, DataStoreLogger> Loggers { get; } = new();
#endregion
#region Methods
public ILogger CreateLogger(string categoryName)
=> _loggers.GetOrAdd(categoryName, name => new DataStoreLogger(name, GetCurrentConfig, _dataStore));
=> Loggers.GetOrAdd(categoryName, name => new DataStoreLogger(name, GetCurrentConfig, DataStore));
protected DataStoreLoggerConfiguration GetCurrentConfig()
=> _currentConfig;
public void Dispose()
{
_loggers.Clear();
_onChangeToken?.Dispose();
GC.SuppressFinalize(this);
Loggers.Clear();
OnChangeToken?.Dispose();
}
#endregion
@@ -2,24 +2,18 @@
using LogViewer.Core;
using Microsoft.Extensions.Logging;
using Serilog.Core;
using System.Globalization;
namespace Serilog.Sinks.LogView.Core;
public class DataStoreLoggerSink : ILogEventSink
{
protected readonly Func<ILogDataStore> _dataStoreProvider;
private readonly IFormatProvider? _formatProvider;
private readonly Func<DataStoreLoggerConfiguration>? _getCurrentConfig;
public DataStoreLoggerSink(Func<ILogDataStore> dataStoreProvider,
public class DataStoreLoggerSink(
Func<ILogDataStore> dataStoreProvider,
Func<DataStoreLoggerConfiguration>? getCurrentConfig = null,
IFormatProvider? formatProvider = null)
{
_formatProvider = formatProvider;
_dataStoreProvider = dataStoreProvider;
_getCurrentConfig = getCurrentConfig;
}
IFormatProvider? formatProvider = null) : ILogEventSink
{
protected Func<ILogDataStore> DataStoreProvider { get; } = dataStoreProvider;
private IFormatProvider? FormatProvider { get; } = formatProvider;
private Func<DataStoreLoggerConfiguration>? GetCurrentConfig { get; } = getCurrentConfig;
public void Emit(LogEvent logEvent)
{
@@ -33,13 +27,13 @@ public class DataStoreLoggerSink : ILogEventSink
_ => LogLevel.Information
};
DataStoreLoggerConfiguration config = _getCurrentConfig?.Invoke() ?? new DataStoreLoggerConfiguration();
DataStoreLoggerConfiguration config = GetCurrentConfig?.Invoke() ?? new DataStoreLoggerConfiguration();
EventId eventId = EventIdFactory(logEvent);
if (eventId.Id == 0 && config.EventId != 0)
eventId = config.EventId;
string message = logEvent.RenderMessage(_formatProvider);
string message = logEvent.RenderMessage(FormatProvider);
string exception = logEvent.Exception?.Message ?? (logEvent.Level >= LogEventLevel.Error ? message : string.Empty);
@@ -50,7 +44,7 @@ public class DataStoreLoggerSink : ILogEventSink
protected virtual void AddLogEntry(LogLevel logLevel, EventId eventId, string message, string exception, LogEntryColor color)
{
ILogDataStore? dataStore = _dataStoreProvider.Invoke();
ILogDataStore? dataStore = DataStoreProvider.Invoke();
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
if (dataStore == null)
@@ -79,11 +73,11 @@ public class DataStoreLoggerSink : ILogEventSink
// ref: https://stackoverflow.com/a/56722516
StructureValue? value = src as StructureValue;
LogEventProperty? idProperty = value!.Properties.FirstOrDefault(x => x.Name.Equals("Id"));
LogEventProperty? idProperty = value!.Properties.FirstOrDefault(x => x.Name.Equals("Id", StringComparison.Ordinal));
if (idProperty is not null)
id = int.Parse(idProperty.Value.ToString());
id = int.Parse(idProperty.Value.ToString(),CultureInfo.InvariantCulture);
LogEventProperty? nameProperty = value.Properties.FirstOrDefault(x => x.Name.Equals("Name"));
LogEventProperty? nameProperty = value.Properties.FirstOrDefault(x => x.Name.Equals("Name", StringComparison.Ordinal));
if (nameProperty is not null)
eventName = nameProperty.Value.ToString().Trim('"');