Version 5.0

NLog · Nov 22, 2022 · 3575229 · 3575229
1 parent f9dde75
commit 3575229
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
-version: 1.3.0.{build}
-image: Visual Studio 2019
+version: 5.0.0.{build}
+image: Visual Studio 2022
 configuration: Release
 platform: Any CPU
 build_script:

diff --git a/src/NLog.DiagnosticSource/LayoutRenderers/ActivityTraceLayoutRenderer.cs b/src/NLog.DiagnosticSource/LayoutRenderers/ActivityTraceLayoutRenderer.cs
@@ -10,7 +10,6 @@ namespace NLog.LayoutRenderers
     /// Layout renderer that can render properties from <see cref="System.Diagnostics.Activity.Current"/>
     /// </summary>
     [LayoutRenderer("activity")]
-    [ThreadSafe]
     public sealed class ActivityTraceLayoutRenderer : LayoutRenderer
     {
         private static string[] DurationMsFormat = null;

diff --git a/src/NLog.DiagnosticSource/LayoutRenderers/OnHasActivityTraceLayoutRendererWrapper.cs b/src/NLog.DiagnosticSource/LayoutRenderers/OnHasActivityTraceLayoutRendererWrapper.cs
@@ -10,7 +10,6 @@
     /// ${onhasactivity:, ActivityTraceId\: ${activity:traceid}}
     /// </example>
     [LayoutRenderer("onhasactivity")]
-    [ThreadSafe]
     public sealed class OnHasActivityTraceLayoutRendererWrapper : WrapperLayoutRendererBase
     {
         /// <inheritdoc/>

diff --git a/src/NLog.DiagnosticSource/NLog.DiagnosticSource.csproj b/src/NLog.DiagnosticSource/NLog.DiagnosticSource.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;net461;netstandard2.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net60;net461;netstandard2.0</TargetFrameworks>
     <RootNamespace>NLog</RootNamespace>
-    <VersionPrefix>1.3.0</VersionPrefix>
+    <VersionPrefix>5.0.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
 
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <!-- AssemblyVersion must be fixed on 1.0.0.0 -->
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+    <!-- AssemblyVersion must be fixed on 5.0.0.0 -->
     <AppVeyorBuildNumber>$(APPVEYOR_BUILD_NUMBER)</AppVeyorBuildNumber>
     <AppVeyorBuildNumber Condition="'$(AppVeyorBuildNumber)' == ''">0</AppVeyorBuildNumber>
     <FileVersion>$(VersionPrefix).$(AppVeyorBuildNumber)</FileVersion>
@@ -24,8 +24,9 @@
     <PackageProjectUrl>https://github.com/NLog/NLog.DiagnosticSource</PackageProjectUrl>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageReleaseNotes>
-Removed target platform net45 and replaced with net461
-Fixed offset by one in ActivityTraceProperty.DurationMs (#57)
+Removed target platform NET5 and replaced with NET6
+Updated to System.Diagnostics.DiagnosticSource v6
+Updated to NLog v5
 
 See https://github.com/NLog/NLog.DiagnosticSource for documentation of ${activity} and DiagnosticListenerTarget
     </PackageReleaseNotes>
@@ -47,12 +48,12 @@ See https://github.com/NLog/NLog.DiagnosticSource for documentation of ${activit
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog" Version="5.0.5" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'!='net50'">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)'!='net60'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/NLog.DiagnosticSource.Tests/NLog.DiagnosticSource.Tests.csproj b/test/NLog.DiagnosticSource.Tests/NLog.DiagnosticSource.Tests.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>