Merge branch 'feat/4.0.0' into fix/version-fallback

getsentry · Oct 9, 2023 · 4a8e249 · 4a8e249
2 parents 7a32076 + 0f77c67
commit 4a8e249
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ API Changes:
 - ISpanContext was removed. Use ITraceContext instead. ([#2668](https://github.com/getsentry/sentry-dotnet/pull/2668))
 - Removed IHasTransactionNameSource. Use ITransactionContext instead. ([#2654](https://github.com/getsentry/sentry-dotnet/pull/2654))
 - Adding `Distribution` to `IEventLike` ([#2660](https://github.com/getsentry/sentry-dotnet/pull/2660))
+- Upgraded to NLog version 5 ([#2697](https://github.com/getsentry/sentry-dotnet/pull/2697))
 - Removed unused `StackFrame.InstructionOffset`. ([#2691](https://github.com/getsentry/sentry-dotnet/pull/2691))
 - Change `StackFrame`'s `ImageAddress`, `InstructionAddress` and `FunctionId` to `long?`. ([#2691](https://github.com/getsentry/sentry-dotnet/pull/2691))
 - Enable `CaptureFailedRequests` by default ([2688](https://github.com/getsentry/sentry-dotnet/pull/2688))

diff --git a/samples/Sentry.Samples.Console.Basic/Sentry.Samples.Console.Basic.csproj b/samples/Sentry.Samples.Console.Basic/Sentry.Samples.Console.Basic.csproj
@@ -2,9 +2,17 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <!-- Remove after switching to .NET 8 SDK -->
+  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <TargetFramework>net6.0</TargetFramework>
+    <PublishAot>false</PublishAot>
+  </PropertyGroup>
+  <PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('OSX'))">
+    <TargetFramework>net7.0</TargetFramework>
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 

diff --git a/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj b/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.2.2" />
+    <PackageReference Include="NLog" Version="5.2.4" />
     <ProjectReference Include="..\..\src\Sentry.NLog\Sentry.NLog.csproj">
       <Private>true</Private>
     </ProjectReference>

diff --git a/src/Sentry.NLog/ConfigurationExtensions.cs b/src/Sentry.NLog/ConfigurationExtensions.cs
@@ -83,7 +83,7 @@ public static LoggingConfiguration AddSentry(
 
         optionsConfig?.Invoke(options);
 
-        Target.Register<SentryTarget>("Sentry");
+        LogManager.Setup().SetupExtensions(e => e.RegisterTarget<SentryTarget>("Sentry"));
 
         var target = new SentryTarget(options)
         {

diff --git a/src/Sentry.NLog/Sentry.NLog.csproj b/src/Sentry.NLog/Sentry.NLog.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.5.11" />
+    <PackageReference Include="NLog" Version="5.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sentry.NLog/SentryTarget.cs b/src/Sentry.NLog/SentryTarget.cs
@@ -58,7 +58,6 @@ internal SentryTarget(SentryNLogOptions options, Func<IHub> hubAccessor, IDispos
     /// <summary>
     /// Options for both the <see cref="SentryTarget"/> and the sentry sdk itself.
     /// </summary>
-    [Advanced]
     public SentryNLogOptions Options { get; }
 
     /// <summary>

diff --git a/src/Sentry/SentryOptions.cs b/src/Sentry/SentryOptions.cs
@@ -662,7 +662,7 @@ public bool ReportAssemblies
     /// <para>The SDK will only capture HTTP Client errors if it is enabled.</para>
     /// <para><see cref="FailedRequestStatusCodes"/> can be used to configure which requests will be treated as failed.</para>
     /// <para>Also <see cref="FailedRequestTargets"/> can be used to filter to match only certain request URLs.</para>
-    /// <para>Defaults to false due to PII reasons.</para>
+    /// <para>Defaults to true.</para>
     /// </summary>
     public bool CaptureFailedRequests { get; set; } = true;
 

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt
@@ -67,7 +67,6 @@ namespace Sentry.NLog
         public bool InitializeSdk { get; set; }
         public string MinimumBreadcrumbLevel { get; set; }
         public string MinimumEventLevel { get; set; }
-        [NLog.Config.Advanced]
         public Sentry.NLog.SentryNLogOptions Options { get; }
         public NLog.Layouts.Layout? Release { get; set; }
         public int ShutdownTimeoutSeconds { get; set; }

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt
@@ -67,7 +67,6 @@ namespace Sentry.NLog
         public bool InitializeSdk { get; set; }
         public string MinimumBreadcrumbLevel { get; set; }
         public string MinimumEventLevel { get; set; }
-        [NLog.Config.Advanced]
         public Sentry.NLog.SentryNLogOptions Options { get; }
         public NLog.Layouts.Layout? Release { get; set; }
         public int ShutdownTimeoutSeconds { get; set; }

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt
@@ -67,7 +67,6 @@ namespace Sentry.NLog
         public bool InitializeSdk { get; set; }
         public string MinimumBreadcrumbLevel { get; set; }
         public string MinimumEventLevel { get; set; }
-        [NLog.Config.Advanced]
         public Sentry.NLog.SentryNLogOptions Options { get; }
         public NLog.Layouts.Layout? Release { get; set; }
         public int ShutdownTimeoutSeconds { get; set; }

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt
@@ -67,7 +67,6 @@ namespace Sentry.NLog
         public bool InitializeSdk { get; set; }
         public string MinimumBreadcrumbLevel { get; set; }
         public string MinimumEventLevel { get; set; }
-        [NLog.Config.Advanced]
         public Sentry.NLog.SentryNLogOptions Options { get; }
         public NLog.Layouts.Layout? Release { get; set; }
         public int ShutdownTimeoutSeconds { get; set; }

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs b/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs
@@ -3,7 +3,7 @@ namespace Sentry.NLog.Tests;
 [UsesVerify]
 public class ApiApprovalTests
 {
-    [Fact]
+    [SkippableFact]
     public Task Run()
     {
         return typeof(SentryTarget).Assembly.CheckApproval();

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.verify.cs b/test/Sentry.NLog.Tests/IntegrationTests.verify.cs
@@ -3,7 +3,7 @@
 [UsesVerify]
 public class IntegrationTests
 {
-    [Fact]
+    [SkippableFact]
     public Task Simple()
     {
         var transport = new RecordingTransport();
@@ -60,7 +60,7 @@ public Task Simple()
             .IgnoreStandardSentryMembers();
     }
 
-    [Fact]
+    [SkippableFact]
     public Task LoggingInsideTheContextOfLogging()
     {
         var transport = new RecordingTransport();

diff --git a/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj b/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.2.2" />
+    <PackageReference Include="NLog" Version="5.2.4" />
     <ProjectReference Include="..\..\src\Sentry.NLog\Sentry.NLog.csproj" />
     <ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />