Bumped Verify.Xunit to version 26.6.0 (#3821)

getsentry · Dec 5, 2024 · fcc9628 · fcc9628
1 parent beb05db
commit fcc9628
Show file tree

Hide file tree

Showing 53 changed files with 204 additions and 56 deletions.
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -56,7 +56,7 @@
 
   <!-- only non-platform-specific projects should include these packages -->
   <ItemGroup Condition="'$(TargetPlatformIdentifier)'==''">
-    <PackageReference Include="Verify.Xunit" Version="22.11.4" />
+    <PackageReference Include="Verify.Xunit" Version="26.6.0" />
     <PackageReference Include="Verify.DiffPlex" Version="2.3.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />

diff --git a/test/Sentry.Android.AssemblyReader.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Android.AssemblyReader.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Android.AssemblyReader.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.AspNet.Tests/ApiApprovalTests.verify.cs b/test/Sentry.AspNet.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.AspNet.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.AspNetCore.Grpc.Tests/ApiApprovalTests.verify.cs b/test/Sentry.AspNetCore.Grpc.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.AspNetCore.Grpc.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.AspNetCore.Tests/ApiApprovalTests.verify.cs b/test/Sentry.AspNetCore.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.AspNetCore.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.AspNetCore.Tests/ScopeExtensionsTests.verify.cs b/test/Sentry.AspNetCore.Tests/ScopeExtensionsTests.verify.cs
@@ -3,7 +3,6 @@
 
 namespace Sentry.AspNetCore.Tests;
 
-[UsesVerify]
 public partial class ScopeExtensionsTests
 {
     [Fact]

diff --git a/test/Sentry.AspNetCore.Tests/WebIntegrationTests.verify.cs b/test/Sentry.AspNetCore.Tests/WebIntegrationTests.verify.cs
@@ -7,7 +7,6 @@
 
 namespace Sentry.AspNetCore.Tests;
 
-[UsesVerify]
 public class WebIntegrationTests
 {
     private readonly TestOutputDiagnosticLogger _logger;

diff --git a/test/Sentry.Azure.Functions.Worker.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Azure.Functions.Worker.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Azure.Functions.Worker.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.DiagnosticSource.IntegrationTests/SqlListenerTests.verify.cs b/test/Sentry.DiagnosticSource.IntegrationTests/SqlListenerTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.DiagnosticSource.IntegrationTests;
 
-[UsesVerify]
 public class SqlListenerTests : IClassFixture<LocalDbFixture>
 {
     private readonly LocalDbFixture _fixture;

diff --git a/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.verify.cs b/test/Sentry.DiagnosticSource.Tests/ApiApprovalTests.verify.cs
@@ -4,7 +4,6 @@
 
 namespace Sentry.DiagnosticSource.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.DiagnosticSource.Tests/DiagnosticsSentryOptionsExtensionsTests.cs b/test/Sentry.DiagnosticSource.Tests/DiagnosticsSentryOptionsExtensionsTests.cs
@@ -4,8 +4,6 @@ namespace Sentry.DiagnosticSource.Tests;
 
 #nullable enable
 
-[UsesVerify]
-
 public class DiagnosticsSentryOptionsExtensionsTests
 {
     private readonly InMemoryDiagnosticLogger _logger = new();

diff --git a/test/Sentry.EntityFramework.Tests/ApiApprovalTests.verify.cs b/test/Sentry.EntityFramework.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.EntityFramework.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.EntityFramework.Tests/IntegrationTests.verify.cs b/test/Sentry.EntityFramework.Tests/IntegrationTests.verify.cs
@@ -1,7 +1,6 @@
 #if NETFRAMEWORK
 namespace Sentry.EntityFramework.Tests;
 
-[UsesVerify]
 [Collection("Sequential")]
 public class IntegrationTests
 {

diff --git a/test/Sentry.Extensions.Logging.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Extensions.Logging.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Extensions.Logging.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.Google.Cloud.Functions.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Google.Cloud.Functions.Tests/ApiApprovalTests.verify.cs
@@ -2,7 +2,6 @@
 
 namespace Sentry.Google.Cloud.Functions.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.Log4Net.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Log4Net.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Log4Net.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.Log4Net.Tests/IntegrationTests.verify.cs b/test/Sentry.Log4Net.Tests/IntegrationTests.verify.cs
@@ -1,4 +1,3 @@
-[UsesVerify]
 public class IntegrationTests
 {
     [Fact]

diff --git a/test/Sentry.Maui.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Maui.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Maui.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs b/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.NLog.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt b/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt
@@ -40,7 +40,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 52,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt b/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt
@@ -40,7 +40,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 52,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt b/test/Sentry.NLog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt
@@ -40,7 +40,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 52,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.Simple.Net4_8.verified.txt b/test/Sentry.NLog.Tests/IntegrationTests.Simple.Net4_8.verified.txt
@@ -40,7 +40,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 52,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.NLog.Tests/IntegrationTests.verify.cs b/test/Sentry.NLog.Tests/IntegrationTests.verify.cs
@@ -1,11 +1,15 @@
+using Sentry.PlatformAbstractions;
+
 namespace Sentry.NLog.Tests;
 
-[UsesVerify]
 public class IntegrationTests
 {
-    [Fact]
+    [SkippableFact]
     public Task Simple()
     {
+        // See: https://github.com/getsentry/sentry-dotnet/issues/3823
+        Skip.If(RuntimeInfo.GetRuntime().IsMono() && TestEnvironment.IsGitHubActions, "Missing DebugImage in CI for Mono");
+
         var transport = new RecordingTransport();
 
         var configuration = new LoggingConfiguration();

diff --git a/test/Sentry.Profiling.Tests/ProfilingSentryOptionsExtensionsTests.cs b/test/Sentry.Profiling.Tests/ProfilingSentryOptionsExtensionsTests.cs
@@ -2,8 +2,6 @@ namespace Sentry.Profiling.Tests;
 
 #nullable enable
 
-[UsesVerify]
-
 public class ProfilingSentryOptionsExtensionsTests
 {
     private readonly InMemoryDiagnosticLogger _logger = new();

diff --git a/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs b/test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs
@@ -6,7 +6,6 @@ namespace Sentry.Profiling.Tests;
 // Note: we must not run tests in parallel because we only support profiling one transaction at a time.
 // That means setting up a test-collection with parallelization disabled and NOT using any async test functions.
 [CollectionDefinition(nameof(SamplingTransactionProfilerTests), DisableParallelization = true)]
-[UsesVerify]
 public class SamplingTransactionProfilerTests
 {
     private readonly TestOutputDiagnosticLogger _testOutputLogger;

diff --git a/test/Sentry.Profiling.Tests/TraceLogProcessorTests.verify.cs b/test/Sentry.Profiling.Tests/TraceLogProcessorTests.verify.cs
@@ -4,7 +4,6 @@
 
 namespace Sentry.Profiling.Tests;
 
-[UsesVerify]
 public class TraceLogProcessorTests
 {
     private readonly IDiagnosticLogger _testOutputLogger;

diff --git a/test/Sentry.Serilog.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Serilog.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Serilog.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt
@@ -203,7 +203,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 47,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt
@@ -203,7 +203,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 47,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt
@@ -203,7 +203,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 48,
+                      LineNumber: 47,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,

diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.verify.cs b/test/Sentry.Serilog.Tests/IntegrationTests.verify.cs
@@ -1,7 +1,6 @@
 #if NET6_0_OR_GREATER
 namespace Sentry.Serilog.Tests;
 
-[UsesVerify]
 [Collection(nameof(SentrySdkCollection))]
 public class IntegrationTests
 {

diff --git a/test/Sentry.Tests/ApiApprovalTests.verify.cs b/test/Sentry.Tests/ApiApprovalTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Tests;
 
-[UsesVerify]
 public class ApiApprovalTests
 {
     [Fact]

diff --git a/test/Sentry.Tests/BaggageHeaderTests.verify.cs b/test/Sentry.Tests/BaggageHeaderTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Tests;
 
-[UsesVerify]
 public partial class BaggageHeaderTests
 {
     [Fact]

diff --git a/test/Sentry.Tests/EventProcessorTests.verify.cs b/test/Sentry.Tests/EventProcessorTests.verify.cs
@@ -1,6 +1,5 @@
 namespace Sentry.Tests;
 
-[UsesVerify]
 public class EventProcessorTests
 {
     private readonly TestOutputDiagnosticLogger _logger;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     namespace Sentry.AspNetCore.Tests;
-    [UsesVerify]
     public partial class ScopeExtensionsTests
     {
         [Fact]
@@ Expand Down @@