From b32ea7cf12d56e88c68679acd8109ad035473f52 Mon Sep 17 00:00:00 2001 From: max Date: Sat, 2 Aug 2025 19:23:04 +0200 Subject: [PATCH] [CHANGE] Updated publish nuget commandline & updated projects target framework. --- .gitea/workflows/BuildLibrary.yml | 2 + DotBased.Logging.MEL/BasedLogger.cs | 24 +++---- .../DotBased.Logging.MEL.csproj | 2 +- .../DotBased.Logging.Serilog.csproj | 2 +- DotBased/DotBased.csproj | 2 +- DotBased/Logging/LogCapsule.cs | 19 +----- DotBased/Logging/Logger.cs | 65 ++----------------- 7 files changed, 21 insertions(+), 95 deletions(-) diff --git a/.gitea/workflows/BuildLibrary.yml b/.gitea/workflows/BuildLibrary.yml index f26a6ad..d0953c8 100644 --- a/.gitea/workflows/BuildLibrary.yml +++ b/.gitea/workflows/BuildLibrary.yml @@ -42,8 +42,10 @@ jobs: --password $GITEA_TOKEN \ --store-password-in-clear-text \ --name gitea \ + --api-key SILENCE_API_KEY_WARNING \ # An random value to silence the 'No API key found' warning. https://git.netzbyte.com/api/packages/$GITEA_USER/nuget/index.json + # --skip-duplicate prevents errors if the package already exists. dotnet nuget push ./artifacts/*.nupkg --source gitea --skip-duplicate env: GITEA_USER: max diff --git a/DotBased.Logging.MEL/BasedLogger.cs b/DotBased.Logging.MEL/BasedLogger.cs index 39574a1..755aeb4 100644 --- a/DotBased.Logging.MEL/BasedLogger.cs +++ b/DotBased.Logging.MEL/BasedLogger.cs @@ -4,13 +4,13 @@ namespace DotBased.Logging.MEL; public class BasedLogger : Microsoft.Extensions.Logging.ILogger { - private const string _messageTemplateKey = "{OriginalFormat}"; + private const string MessageTemplateKey = "{OriginalFormat}"; public BasedLogger(ILogger logger) { - basedLogger = logger; + _basedLogger = logger; } - private readonly ILogger basedLogger; + private readonly ILogger _basedLogger; public void Log(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func formatter) { @@ -18,7 +18,7 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger return; var severity = ConvertLogLevelToSeverity(logLevel); var capsule = ConstructCapsule(severity, eventId, state, exception, formatter); - basedLogger.Log(capsule); + _basedLogger.Log(capsule); } private LogCapsule ConstructCapsule(LogSeverity severity, EventId eventId, TState state, Exception? exception, Func formatter) @@ -29,7 +29,7 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger { foreach (var prop in stateEnum) { - if (prop is { Key: _messageTemplateKey, Value: string propValueString }) + if (prop is { Key: MessageTemplateKey, Value: string propValueString }) { msgTemplate = propValueString; continue; @@ -37,16 +37,8 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger templateParams.Add(prop.Value); } } - - return new LogCapsule() - { - Exception = exception, - Message = msgTemplate, - Parameters = templateParams.ToArray(), - Severity = severity, - TimeStamp = DateTime.Now, - Logger = basedLogger as LoggerBase ?? throw new NullReferenceException(nameof(basedLogger)) - }; + + return new LogCapsule(_basedLogger as LoggerBase ?? throw new NullReferenceException(nameof(_basedLogger)), severity, msgTemplate, exception, templateParams.ToArray(), DateTime.Now); } private LogSeverity ConvertLogLevelToSeverity(LogLevel level) @@ -66,5 +58,5 @@ public class BasedLogger : Microsoft.Extensions.Logging.ILogger public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None; - public IDisposable? BeginScope(TState state) where TState : notnull => default; + public IDisposable? BeginScope(TState state) where TState : notnull => null; } \ No newline at end of file diff --git a/DotBased.Logging.MEL/DotBased.Logging.MEL.csproj b/DotBased.Logging.MEL/DotBased.Logging.MEL.csproj index 9b5d862..d736a10 100644 --- a/DotBased.Logging.MEL/DotBased.Logging.MEL.csproj +++ b/DotBased.Logging.MEL/DotBased.Logging.MEL.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net8.0 enable enable 12 diff --git a/DotBased.Logging.Serilog/DotBased.Logging.Serilog.csproj b/DotBased.Logging.Serilog/DotBased.Logging.Serilog.csproj index e43e411..2e065aa 100755 --- a/DotBased.Logging.Serilog/DotBased.Logging.Serilog.csproj +++ b/DotBased.Logging.Serilog/DotBased.Logging.Serilog.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net8.0 enable default diff --git a/DotBased/DotBased.csproj b/DotBased/DotBased.csproj index abda654..1c9db32 100755 --- a/DotBased/DotBased.csproj +++ b/DotBased/DotBased.csproj @@ -4,7 +4,7 @@ enable enable default - netstandard2.1 + net8.0 diff --git a/DotBased/Logging/LogCapsule.cs b/DotBased/Logging/LogCapsule.cs index 4c8e423..8f997cc 100755 --- a/DotBased/Logging/LogCapsule.cs +++ b/DotBased/Logging/LogCapsule.cs @@ -3,21 +3,4 @@ namespace DotBased.Logging; /// /// This will contain all the log event information that the log adapter will receive. /// -public class LogCapsule -{ - /// - /// The log serverty this log event is being logged. - /// - public LogSeverity Severity { get; set; } - public string Message { get; set; } = string.Empty; - public Exception? Exception { get; set; } - public object?[]? Parameters { get; set; } - /// - /// Time stamp on when this event happend - /// - public DateTime TimeStamp { get; set; } - /// - /// The logger that generated this capsule - /// - public LoggerBase Logger { get; set; } -} \ No newline at end of file +public record LogCapsule(LoggerBase Logger, LogSeverity Severity, string Message, Exception? Exception, object?[]? Parameters, DateTime TimeStamp); \ No newline at end of file diff --git a/DotBased/Logging/Logger.cs b/DotBased/Logging/Logger.cs index 79db121..9480070 100755 --- a/DotBased/Logging/Logger.cs +++ b/DotBased/Logging/Logger.cs @@ -7,88 +7,37 @@ public class Logger(LoggerInformation loggerInformation, string name) : LoggerBa { public override void Verbose(string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Verbose, - TimeStamp = DateTime.Now - }); + Log(new LogCapsule(this, LogSeverity.Verbose, message, null, parameters, DateTime.Now)); } public override void Trace(string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Trace, - TimeStamp = DateTime.Now - }); + Log(new LogCapsule(this, LogSeverity.Trace, message, null, parameters, DateTime.Now)); } public override void Debug(string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Debug, - TimeStamp = DateTime.Now - }); + Log(new LogCapsule(this, LogSeverity.Debug, message, null, parameters, DateTime.Now)); } public override void Information(string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Info, - TimeStamp = DateTime.Now - }); + Log(new LogCapsule(this, LogSeverity.Info, message, null, parameters, DateTime.Now)); } public override void Warning(string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Warning, - TimeStamp = DateTime.Now - }); + Log(new LogCapsule(this, LogSeverity.Warning, message, null, parameters, DateTime.Now)); } public override void Error(Exception exception, string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Error, - TimeStamp = DateTime.Now, - Exception = exception - }); + Log(new LogCapsule(this, LogSeverity.Error, message, null, parameters, DateTime.Now)); } public override void Fatal(Exception exception, string message, params object?[]? parameters) { - Log(new LogCapsule() - { - Logger = this, - Message = message, - Parameters = parameters, - Severity = LogSeverity.Fatal, - TimeStamp = DateTime.Now, - Exception = exception - }); + Log(new LogCapsule(this, LogSeverity.Fatal, message, null, parameters, DateTime.Now)); } public override int GetHashCode() => HashCode.Combine(LoggerInformation.TypeFullName, LoggerInformation.AssemblyFullname);