Version 6.0.3 - NET10 (#145)

Author: snakefoot

appveyor.yml

@@ -6,10 +6,15 @@ skip_tags: true
 skip_branch_with_pr: true
 nuget:
   disable_publish_on_pr: true
+install:
+- ps: |
+    Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
+    & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
 build_script:
-- ps: msbuild /t:restore,pack /p:Configuration=Release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:ContinuousIntegrationBuild=true /p:EmbedUntrackedSources=true /p:PublishRepositoryUrl=true /verbosity:minimal
+- ps: dotnet --version
+- ps: dotnet pack /p:Configuration=Release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /maxcpucount /p:ContinuousIntegrationBuild=true /p:EmbedUntrackedSources=true /verbosity:minimal
 test_script:
-- ps: dotnet test test\NLog.DiagnosticSource.Tests\NLog.DiagnosticSource.Tests.csproj
+- ps: dotnet test /p:Configuration=Release test/NLog.DiagnosticSource.Tests\NLog.DiagnosticSource.Tests.csproj
 artifacts:
   - path: '**\NLog.*.nupkg'
   - path: '**\NLog.*.snupkg'
@@ -19,4 +24,7 @@ deploy:
     secure: f6oWebyOFLpuuo2PMd6xgoxwMq+JvXVUmPyBme89zS7UF0zcvLYPSKN/p6B/KaMs
   on:
     branch: master
-
+environment:
+    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+    DOTNET_CLI_TELEMETRY_OPTOUT: true
+    DOTNET_NOLOGO: true

src/NLog.DiagnosticSource/NLog.DiagnosticSource.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;net462;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net8.0;net6.0;net462;netstandard2.0</TargetFrameworks>
     <RootNamespace>NLog</RootNamespace>
-    <VersionPrefix>6.0.2</VersionPrefix>
+    <VersionPrefix>6.0.3</VersionPrefix>
     <VersionSuffix></VersionSuffix>
 
     <AssemblyVersion>6.0.0.0</AssemblyVersion>
@@ -16,7 +16,7 @@
     <Company>NLog</Company>
     <Authors>NLog</Authors>
     <Copyright>NLog</Copyright>
-    <Description>NLog Integration for Microsoft System.Diagnostics.DiagnosticSource and Activity Trace</Description>
+    <Description>NLog Integration for Microsoft System.Diagnostics.DiagnosticSource and Activity TraceId / SpanId</Description>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/NLog/NLog.DiagnosticSource.git</RepositoryUrl>
     <PackageTags>DiagnosticSource;NLog;logging;log</PackageTags>
@@ -25,7 +25,8 @@
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
-- Updated NLog v6.0.2
+- Added NET10 targetframework
+- Updated NLog v6.0.3
 
 See https://github.com/NLog/NLog.DiagnosticSource for documentation of ${activity} and DiagnosticListenerTarget
     </PackageReleaseNotes>
@@ -45,7 +46,7 @@ See https://github.com/NLog/NLog.DiagnosticSource for documentation of ${activit
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="6.0.2" />
+    <PackageReference Include="NLog" Version="6.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 

test/NLog.DiagnosticSource.Tests/ActivityTraceLayoutRendererTests.cs

@@ -6,6 +6,15 @@ namespace NLog.DiagnosticSource.Tests
 {
     public class ActivityTraceLayoutRendererTests
     {
+        public ActivityTraceLayoutRendererTests()
+        {
+            System.Diagnostics.Activity.Current = null;
+            NLog.LogManager.Setup().SetupExtensions(ext => {
+                ext.RegisterLayoutRenderer<ActivityTraceLayoutRenderer>("activity");
+            });
+            NLog.LogManager.ThrowExceptions = true;
+        }
+
         [Fact]
         public void TestAllPropertiesWhenActivityNull()
         {
@@ -355,4 +364,4 @@ public void TestEventsDoubleItemJson()
             }
         }
     }
-}
+}

test/NLog.DiagnosticSource.Tests/DiagnosticListenerTargetTests.cs

@@ -10,6 +10,14 @@ namespace NLog.DiagnosticSource.Tests
 {
     public class DiagnosticListenerTargetTests
     {
+        public DiagnosticListenerTargetTests()
+        {
+            NLog.LogManager.Setup().SetupExtensions(ext => {
+                ext.RegisterTarget<DiagnosticListenerTarget>("DiagnosticListener");
+            });
+            NLog.LogManager.ThrowExceptions = true;
+        }
+
         [Fact]
         public void DiagnosticSource_WriteMessage()
         {

test/NLog.DiagnosticSource.Tests/NLog.DiagnosticSource.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net10.0;net8.0;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -14,6 +14,10 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
+    <PackageReference Include="System.Text.Json" Version="10.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\NLog.DiagnosticSource\NLog.DiagnosticSource.csproj" />
   </ItemGroup>

test/NLog.DiagnosticSource.Tests/OnHasActivityLayoutRendererTests.cs

@@ -7,13 +7,22 @@ namespace NLog.DiagnosticSource.Tests
 {
     public class OnHasActivityLayoutRendererTests
     {
+        public OnHasActivityLayoutRendererTests()
+        {
+            System.Diagnostics.Activity.Current = null;
+            NLog.LogManager.Setup().SetupExtensions(ext => {
+                ext.RegisterLayoutRenderer<ActivityTraceLayoutRenderer>("activity");
+                ext.RegisterLayoutRenderer<OnHasActivityTraceLayoutRendererWrapper>("onhasactivity");
+            });
+            NLog.LogManager.ThrowExceptions = true;
+        }
+
         [Fact]
         public void OnHasActivityNotActive()
         {
             // Arrange
             System.Diagnostics.Activity.Current = null;
-            LayoutRenderer.Register("activity", typeof(ActivityTraceLayoutRenderer));
-            LayoutRenderer.Register("onhasactivity", typeof(OnHasActivityTraceLayoutRendererWrapper));
+
             var logFactory = new LogFactory();
             var logConfig = new LoggingConfiguration(logFactory);
             var memTarget = new NLog.Targets.MemoryTarget("memory");
@@ -36,8 +45,7 @@ public void OnHasActivityStarted()
         {
             // Arrange
             System.Diagnostics.Activity.Current = null;
-            LayoutRenderer.Register("activity", typeof(ActivityTraceLayoutRenderer));
-            LayoutRenderer.Register("onhasactivity", typeof(OnHasActivityTraceLayoutRendererWrapper));
+
             var logFactory = new LogFactory();
             var logConfig = new LoggingConfiguration(logFactory);
             var memTarget = new NLog.Targets.MemoryTarget("memory");