Added .NET 4.8 and upgraded project to .NET 8.0

This commit is contained in:
2024-02-08 20:33:44 +01:00
parent 54239a44c7
commit 681a940f96
5 changed files with 32 additions and 35 deletions

View File

@@ -1,22 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks> <TargetFrameworks>.netstandard2.1; net6.0; net7.0; net8.0; net4.8;</TargetFrameworks>
netstandard2.1;
net6.0;
net7.0;
</TargetFrameworks>
<ApplicationIcon>icon.ico</ApplicationIcon> <ApplicationIcon>icon.ico</ApplicationIcon>
<Version>1.2.3</Version> <LangVersion>latest</LangVersion>
<Version>1.2.4</Version>
<Authors>EonaCat (Jeroen Saey)</Authors> <Authors>EonaCat (Jeroen Saey)</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>EonaCat (Jeroen Saey)</Company> <Company>EonaCat (Jeroen Saey)</Company>
<PackageIcon>icon.png</PackageIcon> <PackageIcon>icon.png</PackageIcon>
<PackageProjectUrl>https://www.nuget.org/packages/EonaCat.Logger/</PackageProjectUrl> <PackageProjectUrl>https://www.nuget.org/packages/EonaCat.Logger/</PackageProjectUrl>
<Description>EonaCat.Logger is a logging library created for .NET Standard.</Description> <Description>EonaCat.Logger is a logging library</Description>
<PackageReleaseNotes>Public release version</PackageReleaseNotes> <PackageReleaseNotes>Public release version</PackageReleaseNotes>
<Copyright>EonaCat (Jeroen Saey)</Copyright> <Copyright>EonaCat (Jeroen Saey)</Copyright>
<PackageTags>EonaCat;Logger;.NET Standard;EonaCatLogger;Log;Writer;Jeroen;Saey</PackageTags> <PackageTags>EonaCat;Logger;EonaCatLogger;Log;Writer;Jeroen;Saey</PackageTags>
<PackageIconUrl /> <PackageIconUrl />
<PackageReadmeFile>README.md</PackageReadmeFile> <PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -25,30 +21,28 @@
<Title>EonaCat.Logger</Title> <Title>EonaCat.Logger</Title>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<ItemGroup> <None Remove="icon.png" />
<None Remove="icon.png" /> <None Include="..\LICENSE">
<None Include="..\LICENSE"> <Pack>True</Pack>
<Pack>True</Pack> <PackagePath>\</PackagePath>
<PackagePath>\</PackagePath> </None>
</None> <None Include="..\README.md">
<None Include="..\README.md"> <Pack>True</Pack>
<Pack>True</Pack> <PackagePath>\</PackagePath>
<PackagePath>\</PackagePath> </None>
</None> <None Include="icon.png">
<None Include="icon.png"> <Pack>True</Pack>
<Pack>True</Pack> <PackagePath>
<PackagePath></PackagePath> </PackagePath>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EonaCat.Json" Version="1.0.3" /> <PackageReference Include="EonaCat.Json" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="LICENSE.md"> <None Update="LICENSE.md">
<Pack>True</Pack> <Pack>True</Pack>
@@ -59,4 +53,4 @@
<PackagePath>\</PackagePath> <PackagePath>\</PackagePath>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -94,7 +94,7 @@ namespace EonaCat.Logger.EonaCatCoreLogger
File.Delete(rollOverFile); File.Delete(rollOverFile);
} }
fileInfo.CopyTo(rollOverFile); fileInfo.CopyTo(rollOverFile);
await File.WriteAllTextAsync(LogFile, string.Empty, cancellationToken).ConfigureAwait(false); File.WriteAllText(LogFile, string.Empty);
} }
else else
{ {

View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;

View File

@@ -10,6 +10,7 @@ using EonaCat.Logger.EonaCatCoreLogger;
using EonaCat.Logger.EonaCatCoreLogger.Extensions; using EonaCat.Logger.EonaCatCoreLogger.Extensions;
using EonaCat.Logger.EonaCatCoreLogger.Models; using EonaCat.Logger.EonaCatCoreLogger.Models;
using EonaCat.Logger.Extensions; using EonaCat.Logger.Extensions;
using System.Text;
namespace EonaCat.Logger.Managers namespace EonaCat.Logger.Managers
{ {
@@ -27,7 +28,7 @@ namespace EonaCat.Logger.Managers
public string CurrentLogFile => LoggerProvider is FileLoggerProvider fileLoggerProvider ? fileLoggerProvider.LogFile : string.Empty; public string CurrentLogFile => LoggerProvider is FileLoggerProvider fileLoggerProvider ? fileLoggerProvider.LogFile : string.Empty;
public bool IsRunning { get; private set; } public bool IsRunning { get; private set; }
private static LogManager _instance; private static LogManager _instance;
private readonly CancellationTokenSource _tokenSource = new CancellationTokenSource(); private readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
@@ -154,8 +155,9 @@ namespace EonaCat.Logger.Managers
Settings.OnLogEvent(logMessage); Settings.OnLogEvent(logMessage);
} }
public void Reset() => Settings.ResetLogEvent(); public void Reset() => Settings.ResetLogEvent();
public LogManager(LoggerSettings settings, string serverIp, int serverPort) public LogManager(LoggerSettings settings, string serverIp, int serverPort)
{ {

View File

@@ -21,7 +21,7 @@ LogManager.Instance.Write("TRAFFIC", ELogType.TRAFFIC, true);
LogManager.Instance.Write("NONE", ELogType.NONE, true); LogManager.Instance.Write("NONE", ELogType.NONE, true);
``` ```
**Logging in ASP .Net 6.0 or higher: ** **Logging in .NET 4.8 or higher: **
```csharp ```csharp
public class Program public class Program