(#140) Tidy

Author: colinangusmackay

src/Stravaig.Extensions.Logging.Diagnostics.Tests/Verify/ModuleInitialiser.cs

@@ -9,7 +9,7 @@ public static class ModuleInitialiser
     [ModuleInitializer]
     public static void InitVerifyStravaigLoggingCapture()
     {
-        DiffTools.UseOrder(DiffTool.Rider, DiffTool.VisualStudioCode);
+        DiffTools.UseOrder(DiffTool.VisualStudioCode, DiffTool.Rider);
         VerifyStravaigLoggingCapture.Initialise();
     }
 }

src/Stravaig.Extensions.Logging.Diagnostics.Tests/Verify/VerifyLogExceptionTests.cs

@@ -31,7 +31,7 @@ public async Task VerifyInnerExceptionsAsync()
         await Verifier.Verify(logs, verifySettings);
     }
 
-    private void ThrowAnExceptionWithInnerExceptions(int depth = 1)
+    private static void ThrowAnExceptionWithInnerExceptions(int depth = 1)
     {
         try
         {

src/Stravaig.Extensions.Logging.Diagnostics.Verify/LogEntryConverter.cs

@@ -110,17 +110,17 @@ private static void WriteException(Context ctx, Exception ex)
             ctx.Writer.WriteValue(ex.GetType().FullName);
         }
 
-        if (ex.InnerException != null && ctx.IsWritingInnerException)
-        {
-            ctx.Writer.WritePropertyName(nameof(ex.InnerException));
-            WriteException(ctx, ex.InnerException);
-        }
-
         if (ctx.IsWritingStackTrace)
         {
             ctx.Writer.WritePropertyName(nameof(ex.StackTrace));
             ctx.Writer.WriteValue(ex.StackTrace);
         }
+        
+        if (ex.InnerException != null && ctx.IsWritingInnerException)
+        {
+            ctx.Writer.WritePropertyName(nameof(ex.InnerException));
+            WriteException(ctx, ex.InnerException);
+        }
 
         ctx.Writer.WriteEndObject();
     }

src/Stravaig.Extensions.Logging.Diagnostics.Verify/Stravaig.Extensions.Logging.Diagnostics.Verify.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <YEAR>$([System.DateTime]::Now.Year)</YEAR>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Title>Verify extensions for Stravaig Logging Capture for Tests</Title>
         <Authors>Colin Angus Mackay</Authors>
         <Copyright>©$(YEAR) Colin Angus Mackay. See licence for more information.</Copyright>
@@ -28,7 +28,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Verify" Version="20.6.0" />
+      <PackageReference Include="Verify" Version="22.11.1" />
     </ItemGroup>
 
     <ItemGroup>