From 9ff4e3ff925b0f6d2b999bae3eff1f3755456463 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Thu, 5 Jun 2025 16:21:01 +0200 Subject: [PATCH 1/4] AWSTarget updated to NLog v5.2.2 for build trimming --- .../changes/4bfde057-7075-4264-adb6-0919945cac6d.json | 11 +++++++++++ .../changes/6b75589f-72e6-4973-b218-21136d118f5d.json | 11 +++++++++++ samples/NLog/ConfigExample/ConfigExample.csproj | 4 ---- src/AWS.Logger.Core/AWS.Logger.Core.csproj | 2 ++ src/NLog.AWS.Logger/AWSTarget.cs | 1 - src/NLog.AWS.Logger/NLog.AWS.Logger.csproj | 9 ++++++--- 6 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 .autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json create mode 100644 .autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json diff --git a/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json b/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json new file mode 100644 index 0000000..48f3445 --- /dev/null +++ b/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json @@ -0,0 +1,11 @@ +{ + "Projects": [ + { + "Name": "AWS.Logger.Core", + "Type": "Patch", + "ChangelogMessages": [ + "Marked IsTrimmable = true" + ] + } + ] +} \ No newline at end of file diff --git a/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json new file mode 100644 index 0000000..e7ff4ee --- /dev/null +++ b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json @@ -0,0 +1,11 @@ +{ + "Projects": [ + { + "Name": "NLog.AWS.Logger", + "Type": "Patch", + "ChangelogMessages": [ + "Updated to NLog v5.2.2 and marked IsTrimmable = true" + ] + } + ] +} \ No newline at end of file diff --git a/samples/NLog/ConfigExample/ConfigExample.csproj b/samples/NLog/ConfigExample/ConfigExample.csproj index 03bc225..14ebc83 100644 --- a/samples/NLog/ConfigExample/ConfigExample.csproj +++ b/samples/NLog/ConfigExample/ConfigExample.csproj @@ -7,10 +7,6 @@ Exe - - - - diff --git a/src/AWS.Logger.Core/AWS.Logger.Core.csproj b/src/AWS.Logger.Core/AWS.Logger.Core.csproj index fd2905d..a47e627 100644 --- a/src/AWS.Logger.Core/AWS.Logger.Core.csproj +++ b/src/AWS.Logger.Core/AWS.Logger.Core.csproj @@ -26,6 +26,8 @@ true true snupkg + true + true 4.0.0 diff --git a/src/NLog.AWS.Logger/AWSTarget.cs b/src/NLog.AWS.Logger/AWSTarget.cs index aea632f..2eaf877 100644 --- a/src/NLog.AWS.Logger/AWSTarget.cs +++ b/src/NLog.AWS.Logger/AWSTarget.cs @@ -29,7 +29,6 @@ public class AWSTarget : TargetWithLayout, IAWSLoggerConfig /// public AWSTarget() { - this.OptimizeBufferReuse = true; } /// diff --git a/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj b/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj index 9464930..fc31160 100644 --- a/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj +++ b/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj @@ -1,4 +1,4 @@ - + net472;netstandard2.0;net8.0 @@ -26,7 +26,10 @@ true true snupkg - + + true + true + 4.0.0 @@ -45,7 +48,7 @@ - + From 829b368043687d94f0031e4fb79e593b6a249918 Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Thu, 5 Jun 2025 16:21:09 +0200 Subject: [PATCH 2/4] Fixed breaking change in NLog v5 --- test/AWS.Logger.NLog.FilterTests/TestFilter.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/AWS.Logger.NLog.FilterTests/TestFilter.cs b/test/AWS.Logger.NLog.FilterTests/TestFilter.cs index 1e47133..122d0f2 100644 --- a/test/AWS.Logger.NLog.FilterTests/TestFilter.cs +++ b/test/AWS.Logger.NLog.FilterTests/TestFilter.cs @@ -1,7 +1,5 @@ using Xunit; using System; -using System.IO; -using System.Reflection; using System.Linq; using NLog.Config; using NLog; @@ -45,7 +43,8 @@ public void CustomFilter() var config = new LoggingConfiguration(); config.AddTarget("FakeAWSTarget", fakeawsTarget); - var rule = new LoggingRule("CustomFilter", LogLevel.Warn,LogLevel.Fatal, fakeawsTarget); + var rule = new LoggingRule("CustomFilter", LogLevel.Warn, LogLevel.Fatal, fakeawsTarget); + rule.FilterDefaultAction = FilterResult.Log; rule.Filters.Add(filter); config.LoggingRules.Add(rule); From 73aeba4a6c7d55171c868310b41f6c0cc629057c Mon Sep 17 00:00:00 2001 From: Rolf Kristensen Date: Mon, 16 Jun 2025 18:55:30 +0200 Subject: [PATCH 3/4] Removed duplicate IsTrimmable options --- .../changes/4bfde057-7075-4264-adb6-0919945cac6d.json | 11 ----------- .../changes/6b75589f-72e6-4973-b218-21136d118f5d.json | 2 +- src/AWS.Logger.Core/AWS.Logger.Core.csproj | 4 +--- src/NLog.AWS.Logger/NLog.AWS.Logger.csproj | 3 --- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 .autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json diff --git a/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json b/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json deleted file mode 100644 index 48f3445..0000000 --- a/.autover/changes/4bfde057-7075-4264-adb6-0919945cac6d.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Projects": [ - { - "Name": "AWS.Logger.Core", - "Type": "Patch", - "ChangelogMessages": [ - "Marked IsTrimmable = true" - ] - } - ] -} \ No newline at end of file diff --git a/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json index e7ff4ee..a360c58 100644 --- a/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json +++ b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json @@ -4,7 +4,7 @@ "Name": "NLog.AWS.Logger", "Type": "Patch", "ChangelogMessages": [ - "Updated to NLog v5.2.2 and marked IsTrimmable = true" + "Updated to NLog v5.2.2 to support IsTrimmable = true" ] } ] diff --git a/src/AWS.Logger.Core/AWS.Logger.Core.csproj b/src/AWS.Logger.Core/AWS.Logger.Core.csproj index a47e627..403d3d7 100644 --- a/src/AWS.Logger.Core/AWS.Logger.Core.csproj +++ b/src/AWS.Logger.Core/AWS.Logger.Core.csproj @@ -1,4 +1,4 @@ - + net472;netstandard2.0;net8.0 @@ -26,8 +26,6 @@ true true snupkg - true - true 4.0.0 diff --git a/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj b/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj index fc31160..8118ea9 100644 --- a/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj +++ b/src/NLog.AWS.Logger/NLog.AWS.Logger.csproj @@ -27,9 +27,6 @@ true snupkg - true - true - 4.0.0 From d066d78c03e8bd9d144ff9238700bdf9b91cb6b9 Mon Sep 17 00:00:00 2001 From: Garrett Beatty Date: Wed, 18 Jun 2025 14:54:16 -0400 Subject: [PATCH 4/4] Update 6b75589f-72e6-4973-b218-21136d118f5d.json --- .autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json index a360c58..b32dfdb 100644 --- a/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json +++ b/.autover/changes/6b75589f-72e6-4973-b218-21136d118f5d.json @@ -2,10 +2,10 @@ "Projects": [ { "Name": "NLog.AWS.Logger", - "Type": "Patch", + "Type": "Major", "ChangelogMessages": [ "Updated to NLog v5.2.2 to support IsTrimmable = true" ] } ] -} \ No newline at end of file +}