max/DotBased
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHANGE] Updated publish nuget commandline & updated projects target framework.
Some checks failed
Build C# Library / build (push) Failing after 1m13s
Details

Browse Source
This commit is contained in:
max
2025-08-02 19:23:04 +02:00
parent bde1e0c28f
commit b32ea7cf12
7 changed files with 21 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/BuildLibrary.yml
View File

@@ -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

24
DotBased.Logging.MEL/BasedLogger.cs
View File

@@ -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<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> 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<TState>(LogSeverity severity, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> 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>(TState state) where TState : notnull => default;
public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
}

2
DotBased.Logging.MEL/DotBased.Logging.MEL.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>12</LangVersion>

2
DotBased.Logging.Serilog/DotBased.Logging.Serilog.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>default</LangVersion>
</PropertyGroup>

2
DotBased/DotBased.csproj
View File

@@ -4,7 +4,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>default</LangVersion>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>

19
DotBased/Logging/LogCapsule.cs
View File

@@ -3,21 +3,4 @@ namespace DotBased.Logging;
/// <summary>
/// This will contain all the log event information that the log adapter will receive.
/// </summary>
public class LogCapsule
{
/// <summary>
/// The log serverty this log event is being logged.
/// </summary>
public LogSeverity Severity { get; set; }
public string Message { get; set; } = string.Empty;
public Exception? Exception { get; set; }
public object?[]? Parameters { get; set; }
/// <summary>
/// Time stamp on when this event happend
/// </summary>
public DateTime TimeStamp { get; set; }
/// <summary>
/// The logger that generated this capsule
/// </summary>
public LoggerBase Logger { get; set; }
}
public record LogCapsule(LoggerBase Logger, LogSeverity Severity, string Message, Exception? Exception, object?[]? Parameters, DateTime TimeStamp);

65
DotBased/Logging/Logger.cs
View File

@@ -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);