Updated for .NET 8

.vscode/tasks.json

@@ -10,11 +10,11 @@
 	"tasks": [
 		{
 			"label": "build",
-			"command": "dotnet build",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			}
+			"type": "process",
+			"command": "dotnet",
+			"args": ["build"],
+			"problemMatcher": "$msCompile",
+			"isBuildCommand": true
 		}
 	]
 }

RaygunCore.AspNetCore/RaygunCore.AspNetCore.csproj

@@ -5,7 +5,7 @@
 		<AssemblyName>RaygunCore.AspNetCore</AssemblyName>
 		<Description>Raygun provider for ASP.NET Core.</Description>
 		<PackageTags>raygun;core;netcore;aspnetcore;aspnetcoremvc</PackageTags>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>

RaygunCore.AspNetCore/Services/RaygunMiddleware.cs

@@ -6,18 +6,11 @@ namespace RaygunCore.Services;
 /// <summary>
 /// Catches pipeline errors and sends them to Raygun.
 /// </summary>
-public class RaygunMiddleware
+public class RaygunMiddleware(RequestDelegate next, IRaygunClient client, IOptions<RaygunOptions> options)
 {
-	readonly RequestDelegate _next;
-	readonly IRaygunClient _client;
-	readonly bool _ignoreCanceledErros;
-
-	public RaygunMiddleware(RequestDelegate next, IRaygunClient client, IOptions<RaygunOptions> options)
-	{
-		_next = next ?? throw new ArgumentNullException(nameof(next));
-		_client = client ?? throw new ArgumentNullException(nameof(client));
-		_ignoreCanceledErros = options.Value.IgnoreCanceledErrors;
-	}
+	readonly RequestDelegate _next = next ?? throw new ArgumentNullException(nameof(next));
+	readonly IRaygunClient _client = client ?? throw new ArgumentNullException(nameof(client));
+	readonly bool _ignoreCanceledErros = options.Value.IgnoreCanceledErrors;
 
 	public async Task Invoke(HttpContext httpContext)
 	{
@@ -27,7 +20,7 @@ public async Task Invoke(HttpContext httpContext)
 		}
 		catch (Exception ex)
 		{
-			if (!_ignoreCanceledErros || ex is not OperationCanceledException)
+			if (!_ignoreCanceledErros || (ex is not OperationCanceledException && ex.GetBaseException() is not OperationCanceledException))
 				await _client.SendAsync(ex, RaygunSeverity.Critical);
 			throw;
 		}

RaygunCore.AspNetCore/Services/RequestMessageProvider.cs

@@ -8,16 +8,10 @@ namespace RaygunCore.Services;
 /// <summary>
 /// Provides <see cref="RaygunMessageDetails"/> with request information from <see cref="HttpContext"/>.
 /// </summary>
-public class RequestMessageProvider : IRaygunMessageProvider
+public class RequestMessageProvider(IHttpContextAccessor httpContextAccessor, IOptions<RaygunOptions> options) : IRaygunMessageProvider
 {
-	readonly IHttpContextAccessor _httpContextAccessor;
-	readonly RaygunOptions _options;
-
-	public RequestMessageProvider(IHttpContextAccessor httpContextAccessor, IOptions<RaygunOptions> options)
-	{
-		_httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
-		_options = options.Value;
-	}
+	readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
+	readonly RaygunOptions _options = options.Value;
 
 	/// <inheritdoc/>
 	public void Apply(RaygunMessageDetails details)

RaygunCore.AspNetCore/Services/ResponseMessageProvider.cs

@@ -7,12 +7,9 @@ namespace RaygunCore.Services;
 /// <summary>
 /// Provides <see cref="RaygunMessageDetails"/> with response information from <see cref="HttpContext"/>.
 /// </summary>
-public class ResponseMessageProvider : IRaygunMessageProvider
+public class ResponseMessageProvider(IHttpContextAccessor httpContextAccessor) : IRaygunMessageProvider
 {
-	readonly IHttpContextAccessor _httpContextAccessor;
-
-	public ResponseMessageProvider(IHttpContextAccessor httpContextAccessor)
-		=> _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
+	readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
 
 	/// <inheritdoc/>
 	public void Apply(RaygunMessageDetails details)

RaygunCore.AspNetCore/Services/UserMessageProvider.cs

@@ -6,12 +6,9 @@ namespace RaygunCore.Services;
 /// <summary>
 /// Provides <see cref="RaygunMessageDetails"/> with user information from <see cref="HttpContext"/>.
 /// </summary>
-public class UserMessageProvider : IRaygunMessageProvider
+public class UserMessageProvider(IHttpContextAccessor httpContextAccessor) : IRaygunMessageProvider
 {
-	readonly IHttpContextAccessor _httpContextAccessor;
-
-	public UserMessageProvider(IHttpContextAccessor httpContextAccessor)
-		=> _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
+	readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
 
 	/// <inheritdoc/>
 	public void Apply(RaygunMessageDetails details)

RaygunCore.Test/RaygunClientTest.cs

@@ -46,11 +46,11 @@ public async Task Index()
 			AppVersion = "1.0",
 			ThrowOnError = true
 		};
-		var raygunMessageBuilder = new DefaultRaygunMessageBuilder(new IRaygunMessageProvider[]
-		{
+		var raygunMessageBuilder = new DefaultRaygunMessageBuilder(
+		[
 			new MainMessageProvider(Options.Create(raygunOptions)),
 			new TestUserMessageProvider()
-		});
+		]);
 		var raygunClient = new DefaultRaygunClient(
 			NullLoggerFactory.Instance.CreateLogger<DefaultRaygunClient>(),
 			httpClientFactory,

RaygunCore.Test/RaygunCore.Test.csproj

@@ -3,7 +3,7 @@
 
 	<PropertyGroup>
 		<AssemblyName>RaygunCore.Test</AssemblyName>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -13,10 +13,10 @@
 
 	<ItemGroup>
 		<ProjectReference Include="../RaygunCore/RaygunCore.csproj" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+		<PackageReference Include="xunit" Version="2.8.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-		<PackageReference Include="FluentAssertions" Version="6.8.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 </Project>

RaygunCore.props

@@ -6,7 +6,7 @@
 		<RepositoryUrl>https://github.com/anfomin/rayguncore</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/anfomin/rayguncore</PackageProjectUrl>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-		<VersionPrefix>2.3.0</VersionPrefix>
+		<VersionPrefix>2.4.0</VersionPrefix>
 		<VersionSuffix Condition="'$(VERSION_SUFFIX)'!=''">$(VERSION_SUFFIX)</VersionSuffix>
 		<NoWarn>$(NoWarn);1573;1591</NoWarn>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>

RaygunCore/IRaygunBuilder.cs

@@ -16,11 +16,8 @@ public interface IRaygunBuilder
 	bool IsLogging { get; }
 }
 
-internal class RaygunBuilder : IRaygunBuilder
+internal class RaygunBuilder(IServiceCollection services) : IRaygunBuilder
 {
-	public IServiceCollection Services { get; }
+	public IServiceCollection Services { get; } = services ?? throw new ArgumentNullException(nameof(services));
 	public bool IsLogging { get; internal set; }
-
-	public RaygunBuilder(IServiceCollection services)
-		=> Services = services ?? throw new ArgumentNullException(nameof(services));
 }

RaygunCore/Messages/RaygunErrorStackTraceLineMessage.cs

@@ -2,8 +2,8 @@
 
 public class RaygunErrorStackTraceLineMessage
 {
-	public int LineNumber { get; set; }
-	public string ClassName { get; set; } = "";
-	public string MethodName { get; set; } = "";
+	public required int LineNumber { get; set; }
+	public required string ClassName { get; set; }
+	public required string MethodName { get; set; }
 	public string? FileName { get; set; }
 }

RaygunCore/Messages/RaygunMessageDetails.cs

@@ -7,8 +7,8 @@ public class RaygunMessageDetails
 	public string? Version { get; set; }
 	public RaygunClientMessage Client { get; set; } = new();
 	public RaygunEnvironmentMessage Environment { get; set; } = new();
-	public List<string> Tags { get; set; } = new();
-	public Dictionary<string, object> UserCustomData { get; set; } = new();
+	public List<string> Tags { get; set; } = [];
+	public Dictionary<string, object> UserCustomData { get; set; } = [];
 	public RaygunErrorMessage Error { get; set; } = new();
 	public RaygunUserMessage? User { get; set; }
 	public RaygunRequestMessage? Request { get; set; }

RaygunCore/Messages/RaygunUserMessage.cs

@@ -1,14 +1,14 @@
 namespace RaygunCore.Messages;
 
-public class RaygunUserMessage
+public class RaygunUserMessage(string identifier)
 {
 	/// <summary>
 	/// Unique Identifier for this user. Set this to the identifier you use internally to look up users,
 	/// or a correlation id for anonymous users if you have one. It doesn't have to be unique, but we will
 	/// treat any duplicated values as the same user. If you use the user's email address as the identifier,
 	/// enter it here as well as the Email field.
 	/// </summary>
-	public string Identifier { get; set; }
+	public string Identifier { get; set; } = identifier;
 
 	/// <summary>
 	/// Flag indicating whether a user is anonymous or not.
@@ -34,9 +34,4 @@ public class RaygunUserMessage
 	/// Device Identifier. Could be used to identify users across apps.
 	/// </summary>
 	public string? UUID { get; set; }
-
-	public RaygunUserMessage(string identifier)
-	{
-		Identifier = identifier;
-	}
 }

RaygunCore/RaygunCore.csproj

@@ -5,15 +5,15 @@
 		<AssemblyName>RaygunCore</AssemblyName>
 		<Description>Raygun provider for .NET Core projects.</Description>
 		<PackageTags>raygun;core;netcore</PackageTags>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
 	</ItemGroup>
 </Project>

RaygunCore/RaygunException.cs

@@ -3,8 +3,6 @@ namespace RaygunCore;
 /// <summary>
 /// Exception that occured when sending error to the Raygun.
 /// </summary>
-public class RaygunException : Exception
+public class RaygunException(Exception innerException) : Exception("Error sending exception to Raygun", innerException)
 {
-	public RaygunException(Exception innerException)
-		: base("Error sending exception to Raygun", innerException) { }
 }

RaygunCore/Services/DefaultRaygunClient.cs

@@ -8,27 +8,19 @@ namespace RaygunCore.Services;
 /// <summary>
 /// Default implementation for <see cref="IRaygunClient"/>.
 /// </summary>
-public class DefaultRaygunClient : IRaygunClient
+public class DefaultRaygunClient(
+	ILogger<DefaultRaygunClient> logger,
+	IHttpClientFactory clientFactory,
+	IRaygunMessageBuilder messageBuilder,
+	IEnumerable<IRaygunValidator> validators,
+	IOptions<RaygunOptions> options
+) : IRaygunClient
 {
-	readonly ILogger _logger;
-	readonly IHttpClientFactory _clientFactory;
-	readonly IRaygunMessageBuilder _messageBuilder;
-	readonly IEnumerable<IRaygunValidator> _validators;
-	readonly RaygunOptions _options;
-
-	public DefaultRaygunClient(
-		ILogger<DefaultRaygunClient> logger,
-		IHttpClientFactory clientFactory,
-		IRaygunMessageBuilder messageBuilder,
-		IEnumerable<IRaygunValidator> validators,
-		IOptions<RaygunOptions> options)
-	{
-		_logger = logger;
-		_clientFactory = clientFactory ?? throw new ArgumentNullException(nameof(clientFactory));
-		_messageBuilder = messageBuilder ?? throw new ArgumentNullException(nameof(messageBuilder));
-		_validators = validators ?? throw new ArgumentNullException(nameof(validators));;
-		_options = options.Value;
-	}
+	readonly ILogger _logger = logger = logger ?? throw new ArgumentNullException(nameof(logger));
+	readonly IHttpClientFactory _clientFactory = clientFactory ?? throw new ArgumentNullException(nameof(clientFactory));
+	readonly IRaygunMessageBuilder _messageBuilder = messageBuilder ?? throw new ArgumentNullException(nameof(messageBuilder));
+	readonly IEnumerable<IRaygunValidator> _validators = validators ?? throw new ArgumentNullException(nameof(validators));
+	readonly RaygunOptions _options = options.Value;
 
 	/// <inheritdoc/>
 	public async Task SendAsync(string message,
@@ -47,8 +39,7 @@ public async Task SendAsync(string message,
 			{
 				var msg = _messageBuilder.Build(message, ex, severity, tags, customData);
 				await TransmitMessageAsync(msg);
-				if (ex != null)
-					ex.MarkSent();
+				ex?.MarkSent();
 			}
 		}
 	}
@@ -73,8 +64,8 @@ protected virtual HttpClient CreateClient()
 	/// <param name="exception">The exception to deliver.</param>
 	protected virtual bool ShouldSend(string message, Exception? exception)
 		=> (exception == null || !exception.IsSent())
-			&& exception is not RaygunException
-			&& _validators.All(v => v.ShouldSend(message, exception));
+		&& exception is not RaygunException
+		&& _validators.All(v => v.ShouldSend(message, exception));
 
 	/// <summary>
 	/// Transmits a message to Raygun.