RehanSaeed · Nov 11, 2021 · Nov 19, 2021 · Nov 22, 2021 · Nov 22, 2021 · Nov 25, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,16 +33,14 @@ jobs:
         with:
           lfs: true
           fetch-depth: 0
-      - name: "Install .NET Core 3.1 SDK"
-        uses: actions/setup-dotnet@v1.8.2
+      - name: "Install .NET SDK 3.1 & 5.0"
+        uses: actions/setup-dotnet@v1.9.0
         with:
-          dotnet-version: "3.1.x"
-      - name: "Install .NET Core 5.0 SDK"
-        uses: actions/setup-dotnet@v1.8.2
-        with:
-          dotnet-version: "5.0.x"
+          dotnet-version: |
+            3.1.x
+            5.0.x
       - name: "Install .NET Core SDK"
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1.9.0
       - name: "Dotnet Tool Restore"
         run: dotnet tool restore
         shell: pwsh
@@ -56,7 +54,7 @@ jobs:
         run: dotnet cake --target=Pack
         shell: pwsh
       - name: "Publish Artefacts"
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v2.3.1
         with:
           name: ${{matrix.os}}
           path: "./Artefacts"
@@ -73,7 +71,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: "Download Artefact"
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v2.1.0
         with:
           name: "windows-latest"
       - name: "Dotnet NuGet Add Source"
@@ -93,7 +91,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: "Download Artefact"
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v2.1.0
         with:
           name: "windows-latest"
       - name: "Dotnet NuGet Push"

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - main
+  pull_request_target:
+    types:
+      - edited
+      - opened
+      - reopened
+      - synchronize
   workflow_dispatch:
 
 jobs:
@@ -13,6 +19,7 @@ jobs:
       pull-requests: read
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - name: "Draft Release"
+        uses: release-drafter/release-drafter@v5.18.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,7 +26,7 @@
 
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.0.64" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.1.46" />
     <PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.2.0-beta.354" />
   </ItemGroup>

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Serilog.Exceptions Banner](https://media.githubusercontent.com/media/RehanSaeed/Serilog.Exceptions/main/Images/Banner.png)
+![Serilog.Exceptions Banner](https://github.com/RehanSaeed/Serilog.Exceptions/blob/main/Images/Banner.png)
 
 [![Serilog.Exceptions NuGet Package](https://img.shields.io/nuget/v/Serilog.Exceptions.svg)](https://www.nuget.org/packages/Serilog.Exceptions/) [![Serilog.Exceptions package in serilog-exceptions feed in Azure Artifacts](https://feeds.dev.azure.com/serilog-exceptions/_apis/public/Packaging/Feeds/8479813c-da6b-4677-b40d-78df8725dc9c/Packages/212043f6-5fe5-4c79-949e-162156b89894/Badge)](https://dev.azure.com/serilog-exceptions/Serilog.Exceptions/_packaging?_a=package&feed=8479813c-da6b-4677-b40d-78df8725dc9c&package=212043f6-5fe5-4c79-949e-162156b89894&preferRelease=true) [![Serilog.Exceptions NuGet Package Downloads](https://img.shields.io/nuget/dt/Serilog.Exceptions)](https://www.nuget.org/packages/Serilog.Exceptions) [![Twitter URL](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/RehanSaeedUK) [![Twitter Follow](https://img.shields.io/twitter/follow/rehansaeeduk.svg?style=social&label=Follow)](https://twitter.com/RehanSaeedUK)
 
@@ -147,7 +147,7 @@ Add the `SqlExceptionDestructurer` during setup:
 
 [![Serilog.Exceptions.EntityFrameworkCore NuGet Package](https://img.shields.io/nuget/v/Serilog.Exceptions.EntityFrameworkCore.svg)](https://www.nuget.org/packages/Serilog.Exceptions.EntityFrameworkCore/) [![Serilog.Exceptions.EntityFrameworkCore package in serilog-exceptions feed in Azure Artifacts](https://feeds.dev.azure.com/serilog-exceptions/_apis/public/Packaging/Feeds/8479813c-da6b-4677-b40d-78df8725dc9c/Packages/ee2cd6f8-4c93-4774-9398-23c49ba41928/Badge)](https://dev.azure.com/serilog-exceptions/Serilog.Exceptions/_packaging?_a=package&feed=8479813c-da6b-4677-b40d-78df8725dc9c&package=ee2cd6f8-4c93-4774-9398-23c49ba41928&preferRelease=true) [![Serilog.Exceptions.EntityFrameworkCore NuGet Package Downloads](https://img.shields.io/nuget/dt/Serilog.Exceptions.EntityFrameworkCore)](https://www.nuget.org/packages/Serilog.Exceptions.EntityFrameworkCore)
 
-> **WARNING**: In older versions of Serilog.Exceptions, if you are using EntityFrameworkCore with Serilog.Exceptions you must add this, otherwise in certain cases your entire database will be logged! This is because the exceptions in Entity Framework Core have properties that link to the entire database schema in them (See [#100](https://github.com/RehanSaeed/Serilog.Exceptions/issues/100), [aspnet/EntityFrameworkCore#15214](https://github.com/aspnet/EntityFrameworkCore/issues/15214)). Newer versions of Serilog.Exceptions avoids this issue by preventing the destructure of properties that implement IQueryable preventing their execution.
+> **WARNING**: In versions of Serilog.Exceptions older than [8.0.0](https://github.com/RehanSaeed/Serilog.Exceptions/releases/tag/8.0.0), if you are using EntityFrameworkCore with Serilog.Exceptions you must add this, otherwise in certain cases your entire database will be logged! This is because the exceptions in Entity Framework Core have properties that link to the entire database schema in them (See [#100](https://github.com/RehanSaeed/Serilog.Exceptions/issues/100), [aspnet/EntityFrameworkCore#15214](https://github.com/aspnet/EntityFrameworkCore/issues/15214)). Newer versions of Serilog.Exceptions avoids this issue by preventing the destructure of properties that implement IQueryable preventing their execution.
 
 Add the [Serilog.Exceptions.EntityFrameworkCore](https://www.nuget.org/packages/Serilog.Exceptions.EntityFrameworkCore/) NuGet package to your project when using EntityFrameworkCore in your project
 

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Label="Files">

diff --git a/Source/Serilog.Exceptions.MsSqlServer/Serilog.Exceptions.MsSqlServer.csproj b/Source/Serilog.Exceptions.MsSqlServer/Serilog.Exceptions.MsSqlServer.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Serilog.Exceptions.Refit/Serilog.Exceptions.Refit.csproj b/Source/Serilog.Exceptions.Refit/Serilog.Exceptions.Refit.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Refit" Version="6.0.15" />
+    <PackageReference Include="Refit" Version="6.3.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/Serilog.Exceptions/Core/DestructuringOptionsBuilder.cs b/Source/Serilog.Exceptions/Core/DestructuringOptionsBuilder.cs
@@ -21,6 +21,7 @@ public class DestructuringOptionsBuilder : IDestructuringOptions
         new ArgumentExceptionDestructurer(),
         new ArgumentOutOfRangeExceptionDestructurer(),
         new AggregateExceptionDestructurer(),
+        new RegexMatchTimeoutExceptionDestructurer(),
         new ReflectionTypeLoadExceptionDestructurer(),
         new OperationCanceledExceptionDestructurer(),
         new TaskCanceledExceptionDestructurer(),

diff --git a/Source/Serilog.Exceptions/Destructurers/RegexMatchTimeoutExceptionDestructurer.cs b/Source/Serilog.Exceptions/Destructurers/RegexMatchTimeoutExceptionDestructurer.cs
@@ -0,0 +1,33 @@
+namespace Serilog.Exceptions.Destructurers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text.RegularExpressions;
+    using Serilog.Exceptions.Core;
+
+    /// <summary>
+    /// Destructurer for <see cref="RegexMatchTimeoutException"/>.
+    /// </summary>
+    public class RegexMatchTimeoutExceptionDestructurer
+        : ExceptionDestructurer
+    {
+        /// <inheritdoc cref="IExceptionDestructurer.TargetTypes"/>
+        public override Type[] TargetTypes => new Type[]
+        {
+            typeof(RegexMatchTimeoutException),
+        };
+
+        /// <inheritdoc cref="IExceptionDestructurer.Destructure"/>
+        public override void Destructure(Exception exception, IExceptionPropertiesBag propertiesBag, Func<Exception, IReadOnlyDictionary<string, object?>?> destructureException)
+        {
+            base.Destructure(exception, propertiesBag, destructureException);
+
+#pragma warning disable CA1062 // Validate arguments of public methods
+            var typedException = (RegexMatchTimeoutException)exception;
+            propertiesBag.AddProperty(nameof(RegexMatchTimeoutException.Input), typedException.Input);
+            propertiesBag.AddProperty(nameof(RegexMatchTimeoutException.Pattern), typedException.Pattern);
+            propertiesBag.AddProperty(nameof(RegexMatchTimeoutException.MatchTimeout), typedException.MatchTimeout.ToString("c"));
+#pragma warning restore CA1062 // Validate arguments of public methods
+        }
+    }
+}
diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
@@ -3,11 +3,11 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="coverlet.collector" PrivateAssets="All" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" PrivateAssets="All" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeCoverage" PrivateAssets="All" Version="17.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.CodeCoverage" PrivateAssets="All" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.4.3">

diff --git a/Tests/Serilog.Exceptions.Test/Destructurers/RegexMatchTimeoutExceptionDestructurerTests.cs b/Tests/Serilog.Exceptions.Test/Destructurers/RegexMatchTimeoutExceptionDestructurerTests.cs
@@ -0,0 +1,30 @@
+namespace Serilog.Exceptions.Test.Destructurers
+{
+    using System;
+    using System.Text.RegularExpressions;
+    using Serilog.Exceptions.Core;
+    using Serilog.Exceptions.Destructurers;
+    using Xunit;
+    using static LogJsonOutputUtils;
+
+    public class RegexMatchTimeoutExceptionDestructurerTests
+    {
+        [Fact]
+        public void RegexMatchTimeoutException_ParamsAttachedAsProperties()
+        {
+            var exception = new RegexMatchTimeoutException("input", "pattern", TimeSpan.FromSeconds(1));
+
+            var optionsBuilder = new DestructuringOptionsBuilder()
+                .WithDestructurers(new IExceptionDestructurer[]
+                {
+                    new RegexMatchTimeoutExceptionDestructurer(),
+                });
+
+            var loggedExceptionDetails = ExtractExceptionDetails(LogAndDestructureException(exception, optionsBuilder));
+
+            Assert_ContainsPropertyWithValue(loggedExceptionDetails, nameof(RegexMatchTimeoutException.Input), exception.Input);
+            Assert_ContainsPropertyWithValue(loggedExceptionDetails, nameof(RegexMatchTimeoutException.Pattern), exception.Pattern);
+            Assert_ContainsPropertyWithValue(loggedExceptionDetails, nameof(RegexMatchTimeoutException.MatchTimeout), exception.MatchTimeout.ToString("c"));
+        }
+    }
+}
diff --git a/Tests/Serilog.Exceptions.Test/Serilog.Exceptions.Test.csproj b/Tests/Serilog.Exceptions.Test/Serilog.Exceptions.Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="FluentAssertions" Version="6.5.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ version: "{build}"
 image:
   - macOS
   - Ubuntu
-  - Visual Studio 2019
+  - Visual Studio 2022
 
 environment:
   # Disable the .NET logo in the console output.

diff --git a/build.cake b/build.cake
@@ -1,8 +1,7 @@
 var target = Argument("Target", "Default");
 var configuration =
     HasArgument("Configuration") ? Argument<string>("Configuration") :
-    EnvironmentVariable("Configuration") is not null ? EnvironmentVariable("Configuration") :
-    "Release";
+    EnvironmentVariable("Configuration", "Release");
 
 var artefactsDirectory = Directory("./Artefacts");
 
@@ -20,17 +19,17 @@ Task("Restore")
     .IsDependentOn("Clean")
     .Does(() =>
     {
-        DotNetCoreRestore();
+        DotNetRestore();
     });
 
 Task("Build")
     .Description("Builds the solution.")
     .IsDependentOn("Restore")
     .Does(() =>
     {
-        DotNetCoreBuild(
+        DotNetBuild(
             ".",
-            new DotNetCoreBuildSettings()
+            new DotNetBuildSettings()
             {
                 Configuration = configuration,
                 NoRestore = true,
@@ -41,9 +40,9 @@ Task("Test")
     .Description("Runs unit tests and outputs test results to the artefacts directory.")
     .DoesForEach(GetFiles("./Tests/**/*.csproj"), project =>
     {
-        DotNetCoreTest(
+        DotNetTest(
             project.ToString(),
-            new DotNetCoreTestSettings()
+            new DotNetTestSettings()
             {
                 Blame = true,
                 Collectors = new string[] { "Code Coverage", "XPlat Code Coverage" },
@@ -63,13 +62,13 @@ Task("Pack")
     .Description("Creates NuGet packages and outputs them to the artefacts directory.")
     .Does(() =>
     {
-        DotNetCorePack(
+        DotNetPack(
             ".",
-            new DotNetCorePackSettings()
+            new DotNetPackSettings()
             {
                 Configuration = configuration,
                 IncludeSymbols = true,
-                MSBuildSettings = new DotNetCoreMSBuildSettings()
+                MSBuildSettings = new DotNetMSBuildSettings()
                 {
                     ContinuousIntegrationBuild = !BuildSystem.IsLocalBuild,
                 },

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.3.0",
+      "version": "2.0.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/global.json b/global.json
@@ -2,6 +2,6 @@
   "sdk": {
     "allowPrerelease": true,
     "rollForward": "latestMajor",
-    "version": "6.0.100"
+    "version": "6.0.102"
   }
 }