Updated to NET8 since NET6 is obsolete

elastic · Dec 10, 2024 · 9e6a84c · 9e6a84c
1 parent 69c93bc
commit 9e6a84c
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 41 deletions.
diff --git a/src/Elastic.Apm.NLog/Elastic.Apm.NLog.csproj b/src/Elastic.Apm.NLog/Elastic.Apm.NLog.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net8.0</TargetFrameworks>
     <Title>Elastic APM NLog Layout Renderers</Title>
     <Description>Enrich NLog log messages with APM TraceId and TransactionId.</Description>
     <IsPackable>True</IsPackable>

diff --git a/src/Elastic.Apm.SerilogEnricher/Elastic.Apm.SerilogEnricher.csproj b/src/Elastic.Apm.SerilogEnricher/Elastic.Apm.SerilogEnricher.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net8.0</TargetFrameworks>
     <Title>Elastic APM Serilog Enricher</Title>
     <Description>Enrich Serilog log messages with APM TraceId and TransactionId.</Description>
     <IsPackable>True</IsPackable>

diff --git a/src/Elastic.CommonSchema.Log4net/Elastic.CommonSchema.Log4net.csproj b/src/Elastic.CommonSchema.Log4net/Elastic.CommonSchema.Log4net.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0</TargetFrameworks>
     <Title>Elastic Common Schema (ECS) log4net Layout</Title>
     <Description>log4net Layout that formats log events in accordance with Elastic Common Schema (ECS).</Description>
     <IsPackable>True</IsPackable>

diff --git a/src/Elastic.CommonSchema.NLog/Elastic.CommonSchema.NLog.csproj b/src/Elastic.CommonSchema.NLog/Elastic.CommonSchema.NLog.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0</TargetFrameworks>
       <Title>Elastic Common Schema (ECS) NLog Layout</Title>
       <Description>NLog Layout that formats log events in accordance with Elastic Common Schema (ECS).</Description>
       <IsPackable>True</IsPackable>

diff --git a/src/Elastic.CommonSchema.Serilog/Elastic.CommonSchema.Serilog.csproj b/src/Elastic.CommonSchema.Serilog/Elastic.CommonSchema.Serilog.csproj
@@ -2,7 +2,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0</TargetFrameworks>
     <Title>Elastic Common Schema (ECS) Serilog Formatter</Title>
     <Description>Serilog TextFormatter that formats log events in accordance with Elastic Common Schema (ECS).</Description>
     <IsPackable>True</IsPackable>

diff --git a/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs b/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs
@@ -183,11 +183,11 @@ private static object PropertyValueToObject(LogEventPropertyValue propertyValue)
 			switch (propertyValue)
 			{
 				case SequenceValue values:
-					return values.Elements.Select(PropertyValueToObject).ToArray();
+					return values.Elements.Select((e) => PropertyValueToObject(e)).ToArray();
 				case ScalarValue sv:
 					return sv.Value;
 				case DictionaryValue dv:
-					return dv.Elements.ToDictionary(keySelector: kvp => kvp.Key.Value.ToString(),
+					return dv.Elements.ToDictionary(keySelector: kvp => kvp.Key.Value.ToString() ?? string.Empty,
 						elementSelector: (kvp) => PropertyValueToObject(kvp.Value));
 				case StructureValue ov:
 				{

diff --git a/src/Elastic.CommonSchema/Elastic.CommonSchema.csproj b/src/Elastic.CommonSchema/Elastic.CommonSchema.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net8.0</TargetFrameworks>
     <Title>Elastic Common Schema (ECS) Types</Title>
     <Description>Maps Elastic Common Schema (ECS) to .NET types including (de)serialization using System.Text.Json</Description>
     <LangVersion>latest</LangVersion>
@@ -14,10 +14,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net462' OR $(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'netstandard2.1'">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) OR $(TargetFramework.StartsWith('net4')) ">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
-
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NullableExtensions.cs" />

diff --git a/src/Elastic.Extensions.Logging.Common/Elastic.Extensions.Logging.Common.csproj b/src/Elastic.Extensions.Logging.Common/Elastic.Extensions.Logging.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <Title>Common Abstactions For ECS For Microsoft.Extensions.Logging</Title>
     <Description>Transient dependency, do not install directly. Common Abstactions For ECS For Microsoft.Extensions.Logging</Description>
     <PackageTags>Logging;LoggerProvider;Elasticsearch;Console;ELK;Kibana;Logstash;Tracing;Diagnostics;Log;Trace;ECS</PackageTags>
@@ -13,8 +13,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Elastic.CommonSchema\Elastic.CommonSchema.csproj"/>
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/Elastic.Extensions.Logging.Common/LogEventBuilderExtensions.cs b/src/Elastic.Extensions.Logging.Common/LogEventBuilderExtensions.cs
@@ -21,7 +21,7 @@ void AddScopeValue<TLocalState>(TLocalState scope, LogEvent log)
 
 			var scopeValues = (scope as IEnumerable<KeyValuePair<string, object>>)?.ToList();
 			var scopeName = scopeValues != null && scopeValues.Any(kv => kv.Key == "{OriginalFormat}")
-				? scope.ToString()
+				? (scope.ToString() ?? string.Empty)
 				: FormatValue(scope, options, 0, scope.GetType().Name);
 			log.Scopes.Add(scopeName);
 
@@ -139,7 +139,7 @@ private static string FormatValue(object value, ILogEventCreationOptions options
 				if (depth < 1 && value is IEnumerable enumerable)
 					return FormatEnumerable(enumerable, depth, options);
 
-				return defaultFallback ?? value.ToString();
+				return defaultFallback ?? value.ToString() ?? string.Empty;
 		}
 	}
 

diff --git a/src/Elastic.Extensions.Logging.Console/Elastic.Extensions.Logging.Console.csproj b/src/Elastic.Extensions.Logging.Console/Elastic.Extensions.Logging.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Title>ECS Console Logger for Microsoft.Extensions.Logging</Title>
     <Description>ECS Console Logger for Microsoft.Extensions.Logging. Writes Elastic Common Schema (ECS), with semantic logging of structured data from message and scope values to console out, use filebeat/Elastic-Agent to send these to Elastic</Description>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Elastic.Extensions.Logging/Elastic.Extensions.Logging.csproj b/src/Elastic.Extensions.Logging/Elastic.Extensions.Logging.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <Title>Elasticsearch Logger Provider</Title>
     <Description>Elasticsearch logger provider for Microsoft.Extensions.Logging. Writes direct to Elasticsearch using the Elastic Common Schema (ECS), with semantic logging of structured data from message and scope values, for use with the Elasticsearch-Logstash-Kibana (ELK) stack. The results can be viewed and queried in the Kibana console.</Description>
     <PackageTags>Logging;LoggerProvider;Elasticsearch;ELK;Kibana;Logstash;Tracing;Diagnostics;Log;Trace;ECS</PackageTags>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
     <ProjectReference Include="..\Elastic.CommonSchema\Elastic.CommonSchema.csproj" />
     <ProjectReference Include="..\Elastic.Extensions.Logging.Common\Elastic.Extensions.Logging.Common.csproj" />
     <ProjectReference Include="..\Elastic.Ingest.Elasticsearch.CommonSchema\Elastic.Ingest.Elasticsearch.CommonSchema.csproj" />

diff --git a/src/Elastic.Extensions.Logging/ElasticsearchLogger.cs b/src/Elastic.Extensions.Logging/ElasticsearchLogger.cs
@@ -43,14 +43,14 @@ internal ElasticsearchLogger(
 			_scopeProvider = scopeProvider;
 		}
 
-		private class EmptyDisposable : IDisposable
+		private sealed class EmptyDisposable : IDisposable
 		{
 			public void Dispose() { }
 		}
 		private readonly IDisposable _emptyScope = new EmptyDisposable();
 
 		/// <inheritdoc cref="ILogger.BeginScope{TState}"/>
-		public IDisposable BeginScope<TState>(TState state) => _scopeProvider?.Push(state) ?? _emptyScope;
+		IDisposable ILogger.BeginScope<TState>(TState state) => _scopeProvider?.Push(state) ?? _emptyScope;
 
 		/// <inheritdoc cref="ILogger.IsEnabled"/>
 		public bool IsEnabled(LogLevel logLevel) => _options.IsEnabled;

diff --git a/src/Elastic.Extensions.Logging/ElasticsearchLoggerProvider.cs b/src/Elastic.Extensions.Logging/ElasticsearchLoggerProvider.cs
@@ -20,10 +20,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-#if NETSTANDARD2_1_OR_GREATER
-using System.Buffers;
-#endif
-
 namespace Elastic.Extensions.Logging
 {
 	/// <summary>
@@ -35,14 +31,14 @@ public class ElasticsearchLoggerProvider : ILoggerProvider, ISupportExternalScop
 	{
 		private readonly IChannelSetup[] _channelConfigurations;
 		private readonly IOptionsMonitor<ElasticsearchLoggerOptions> _options;
-		private readonly IDisposable _optionsReloadToken;
+		private readonly IDisposable? _optionsReloadToken;
 		private IExternalScopeProvider? _scopeProvider;
 		private IBufferedChannel<LogEvent> _shipper;
 
 		private static readonly LogEventWriter LogEventWriterInstance = new()
 		{
 			WriteToStreamAsync = static async (stream, logEvent, ctx) => await logEvent.SerializeAsync(stream, ctx).ConfigureAwait(false),
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET8_0_OR_GREATER
 			WriteToArrayBuffer = static (arrayBufferWriter, logEvent) =>
 			{
 				var serialized = logEvent.SerializeToUtf8Bytes(); // TODO - Performance optimisation to avoid array allocation
@@ -84,7 +80,7 @@ public ILogger CreateLogger(string name) =>
 		/// <inheritdoc cref="IDisposable.Dispose"/>
 		public void Dispose()
 		{
-			_optionsReloadToken.Dispose();
+			_optionsReloadToken?.Dispose();
 			_shipper.Dispose();
 		}
 
@@ -216,8 +212,8 @@ private IBufferedChannel<LogEvent> CreatIngestChannel(ElasticsearchLoggerOptions
 
 		private sealed class LogEventWriter : IElasticsearchEventWriter<LogEvent>
 		{
-#if NETSTANDARD2_1_OR_GREATER
-			public Action<ArrayBufferWriter<byte>, LogEvent>? WriteToArrayBuffer { get; set; }
+#if NETSTANDARD2_1_OR_GREATER || NET8_0_OR_GREATER
+			public Action<System.Buffers.ArrayBufferWriter<byte>, LogEvent>? WriteToArrayBuffer { get; set; }
 #endif
 
 			public Func<Stream, LogEvent, CancellationToken, Task>? WriteToStreamAsync { get; set; }

diff --git a/...lastic.Ingest.Elasticsearch.CommonSchema/Elastic.Ingest.Elasticsearch.CommonSchema.csproj b/...lastic.Ingest.Elasticsearch.CommonSchema/Elastic.Ingest.Elasticsearch.CommonSchema.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <IsPackable>True</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Elastic.NLog.Targets/Elastic.NLog.Targets.csproj b/src/Elastic.NLog.Targets/Elastic.NLog.Targets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <Title>Elasticsearch NLog Target</Title>
     <Description>NLog Target that exports directly to Elastic Cloud or individual Elasticsearch nodes</Description>
     <RootNamespace>NLog.Targets</RootNamespace>

diff --git a/src/Elastic.Serilog.Enrichers.Web/Elastic.Serilog.Enrichers.Web.csproj b/src/Elastic.Serilog.Enrichers.Web/Elastic.Serilog.Enrichers.Web.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Title>Elastic Common Schema (ECS) Serilog Enricher for Web proeprties</Title>

diff --git a/src/Elastic.Serilog.Sinks/Elastic.Serilog.Sinks.csproj b/src/Elastic.Serilog.Sinks/Elastic.Serilog.Sinks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <IsPackable>True</IsPackable>
   </PropertyGroup>

diff --git a/tests/Elastic.CommonSchema.Serilog.Tests/Elastic.CommonSchema.Serilog.Tests.csproj b/tests/Elastic.CommonSchema.Serilog.Tests/Elastic.CommonSchema.Serilog.Tests.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.3" />
         <PackageReference Include="Serilog.Enrichers.Process" Version="2.0.1" />
         <PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00747" />

diff --git a/tests/Elastic.CommonSchema.Tests/Elastic.CommonSchema.Tests.csproj b/tests/Elastic.CommonSchema.Tests/Elastic.CommonSchema.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/tests/Elastic.Serilog.Sinks.Tests/Elastic.Serilog.Sinks.Tests.csproj b/tests/Elastic.Serilog.Sinks.Tests/Elastic.Serilog.Sinks.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1"/>
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2"/>
   </ItemGroup>