Virtual + min package deps

Author: mishamyte

sample/Serilog.Sinks.Grafana.Loki.Sample/Serilog.Sinks.Grafana.Loki.Sample.csproj

@@ -2,13 +2,13 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="2.12.0" />
+        <PackageReference Include="Serilog" Version="3.0.1" />
         <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     </ItemGroup>

sample/Serilog.Sinks.Grafana.Loki.SampleWebApp/Program.cs

@@ -5,9 +5,9 @@
 
 var builder = WebApplication.CreateBuilder();
 
-builder.Host
-    .ConfigureLogging((_, loggingBuilder) => loggingBuilder.ClearProviders())
-    .UseSerilog((ctx, cfg) => cfg.ReadFrom.Configuration(ctx.Configuration));
+builder.Logging.ClearProviders();
+
+builder.Host.UseSerilog((ctx, cfg) => cfg.ReadFrom.Configuration(ctx.Configuration));
 
 // Add services to the container.
 builder.Services.AddControllers();

sample/Serilog.Sinks.Grafana.Loki.SampleWebApp/Serilog.Sinks.Grafana.Loki.SampleWebApp.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
         <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
         <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     </ItemGroup>

src/Serilog.Sinks.Grafana.Loki/DictionaryComparer.cs

@@ -19,13 +19,23 @@ internal class DictionaryComparer<TKey, TValue> : IEqualityComparer<IDictionary<
 {
     public static DictionaryComparer<TKey, TValue> Instance { get; } = new();
 
-    public bool Equals(IDictionary<TKey, TValue> x, IDictionary<TKey, TValue> y)
+    public bool Equals(IDictionary<TKey, TValue>? x, IDictionary<TKey, TValue>? y)
     {
         if (ReferenceEquals(x, y))
         {
             return true;
         }
 
+        if (ReferenceEquals(x, null))
+        {
+            return false;
+        }
+
+        if (ReferenceEquals(y, null))
+        {
+            return false;
+        }
+
         if (x.GetType() != y.GetType())
         {
             return false;

src/Serilog.Sinks.Grafana.Loki/LokiJsonTextFormatter.cs

@@ -62,7 +62,7 @@ public LokiJsonTextFormatter(IReservedPropertyRenamingStrategy renamingStrategy)
     /// <param name="output">
     /// The output.
     /// </param>
-    public void Format(LogEvent logEvent, TextWriter output)
+    public virtual void Format(LogEvent logEvent, TextWriter output)
     {
         if (logEvent == null)
         {

src/Serilog.Sinks.Grafana.Loki/Serilog.Sinks.Grafana.Loki.csproj

@@ -4,28 +4,28 @@
         <AssemblyName>Serilog.Sinks.Grafana.Loki</AssemblyName>
         <Description>A Serilog sink sending log events to Grafana Loki</Description>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <!--SourceLink -->
         <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
         <DebugType>embedded</DebugType>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <RepositoryUrl>https://github.com/mishamyte/serilog-sinks-grafana-loki.git</RepositoryUrl>
+        <RepositoryUrl>https://github.com/serilog-contrib/serilog-sinks-grafana-loki.git</RepositoryUrl>
         <!--NuGet package-->
         <PackageIcon>serilog-sink-nuget.png</PackageIcon>
         <PackageId>Serilog.Sinks.Grafana.Loki</PackageId>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
-        <PackageProjectUrl>https://github.com/mishamyte/serilog-sinks-grafana-loki</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/erilog-contrib/serilog-sinks-grafana-loki</PackageProjectUrl>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageReleaseNotes>For release notes, please see the change log on GitHub.</PackageReleaseNotes>
         <PackageTags>serilog;loki;grafana</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Serilog" Version="2.12.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.3" />
+        <PackageReference Include="System.Text.Json" Version="4.7.0" />
     </ItemGroup>
 
     <ItemGroup>

test/Serilog.Sinks.Grafana.Loki.Tests/Serilog.Sinks.Grafana.Loki.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>