update verify (#1723)

Author: SimonCropp

test/Directory.Build.props

@@ -41,8 +41,8 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="Verify.Xunit" Version="16.8.2" />
-    <PackageReference Include="Verify.DiffPlex" Version="1.2.0" />
+    <PackageReference Include="Verify.Xunit" Version="17.1.4" />
+    <PackageReference Include="Verify.DiffPlex" Version="1.3.0" />
     <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.0" />
   </ItemGroup>

test/Sentry.DiagnosticSource.IntegrationTests/VerifyExtensions.cs

@@ -2,18 +2,15 @@ static class VerifyExtensions
 {
     public static SettingsTask IgnoreStandardSentryMembers(this SettingsTask settings)
     {
-        return settings.ModifySerialization(
-            p =>
-            {
-                p.AddExtraSettings(x => x.Converters.Add(new SpansConverter()));
-                p.IgnoreMembersWithType<Contexts>();
-                p.IgnoreMembersWithType<SdkVersion>();
-                p.IgnoreMembersWithType<DateTimeOffset>();
-                p.IgnoreMembersWithType<SpanId>();
-                p.IgnoreMembersWithType<SentryId>();
-                p.IgnoreMembers<SentryEvent>(e => e.Modules, e => e.Release);
-                p.IgnoreMembers<Transaction>(t => t.Release);
-                p.IgnoreMembers<SentryException>(e => e.Module, e => e.ThreadId);
-            });
+        return settings
+            .AddExtraSettings(x => x.Converters.Add(new SpansConverter()))
+            .IgnoreMembersWithType<Contexts>()
+            .IgnoreMembersWithType<SdkVersion>()
+            .IgnoreMembersWithType<DateTimeOffset>()
+            .IgnoreMembersWithType<SpanId>()
+            .IgnoreMembersWithType<SentryId>()
+            .IgnoreMembers<SentryEvent>(e => e.Modules, e => e.Release)
+            .IgnoreMembers<Transaction>(t => t.Release)
+            .IgnoreMembers<SentryException>(e => e.Module, e => e.ThreadId);
     }
 }

test/Sentry.Tests/Internals/CollectionExtensionsTests.cs

@@ -7,7 +7,8 @@ public class CollectionExtensionsTests
     public Task GetOrCreate_invalid_type()
     {
         var dictionary = new ConcurrentDictionary<string, object> {["key"] = 1};
-        return Throws(() => dictionary.GetOrCreate<Value>("key")).IgnoreStackTrack();
+        return Throws(() => dictionary.GetOrCreate<Value>("key"))
+            .IgnoreStackTrace();
     }
 
     class Value

test/Sentry.Tests/Internals/MainExceptionProcessorTests.CreateSentryException_Aggregate.verified.txt

@@ -2,13 +2,11 @@
   {
     Type: System.Exception,
     Value: Inner message1,
-    ThreadId: Id_1,
     Mechanism: {}
   },
   {
     Type: System.Exception,
     Value: Inner message2,
-    ThreadId: Id_1,
     Mechanism: {}
   }
 ]

test/Sentry.Tests/Internals/MainExceptionProcessorTests.CreateSentryException_Aggregate_Keep.verified.txt

@@ -2,18 +2,15 @@
   {
     Type: System.Exception,
     Value: Inner message1,
-    ThreadId: Id_1,
     Mechanism: {}
   },
   {
     Type: System.Exception,
     Value: Inner message2,
-    ThreadId: Id_1,
     Mechanism: {}
   },
   {
     Type: System.AggregateException,
-    ThreadId: Id_1,
     Mechanism: {}
   }
 ]

test/Sentry.Tests/ModuleInit.cs

@@ -6,7 +6,8 @@ public static class ModuleInit
     public static void Init()
     {
         VerifyDiffPlex.Initialize();
-        VerifierSettings.IgnoreMember<SentryException>(_=>_.Module);
+        VerifierSettings.IgnoreMembers<SentryException>(_ => _.Module, _ => _.ThreadId);
+
         VerifierSettings.MemberConverter<Breadcrumb, IReadOnlyDictionary<string, string>>(
             target => target.Data,
             (_, value) =>