From b3b11b06fd47dddfa3321b9f118423aa7789934b Mon Sep 17 00:00:00 2001 From: Vladimir Pecanac Date: Sat, 14 Nov 2026 14:16:59 +0100 Subject: [PATCH] MessageTemplateForLoggingCA2254: move to net11.0, CA2254 .editorconfig, culture-safe tests Both projects target net11.0. Microsoft.Extensions.Hosting 11.0.0, the Configuration package dropped, Program.cs uses Host.CreateApplicationBuilder(args). The new .editorconfig raises CA2254 to a warning, so the build reports the two intended CA2254 warnings. Tests: FluentAssertions removed (unused), NSubstitute 6.2.0, xunit 2.9.3, runner 4.0.1, Test.Sdk 18.12.0, coverlet 10.1.0, and three expected strings built with the invariant culture the logger uses. --- .../.editorconfig | 4 ++++ .../MessageTemplateForLoggingCA2254.csproj | 5 ++--- .../Program.cs | 19 +++---------------- .../Tests/ApplicationTests.cs | 13 ++++++++++--- .../Tests/Tests.csproj | 13 ++++++------- 5 files changed, 25 insertions(+), 29 deletions(-) create mode 100644 dotnet-logging/MessageTemplateForLoggingCA2254/.editorconfig diff --git a/dotnet-logging/MessageTemplateForLoggingCA2254/.editorconfig b/dotnet-logging/MessageTemplateForLoggingCA2254/.editorconfig new file mode 100644 index 0000000000..aeb6bd98d1 --- /dev/null +++ b/dotnet-logging/MessageTemplateForLoggingCA2254/.editorconfig @@ -0,0 +1,4 @@ +root = true + +[*.cs] +dotnet_diagnostic.CA2254.severity = warning diff --git a/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254.csproj b/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254.csproj index 1b0acdc30a..3ffbe20600 100644 --- a/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254.csproj +++ b/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254.csproj @@ -2,14 +2,13 @@ Exe - net8.0 + net11.0 enable enable - - + diff --git a/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/Program.cs b/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/Program.cs index be5ddf66b0..68d446711d 100644 --- a/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/Program.cs +++ b/dotnet-logging/MessageTemplateForLoggingCA2254/MessageTemplateForLoggingCA2254/Program.cs @@ -1,24 +1,11 @@ using MessageTemplateForLoggingCA2254; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -IConfiguration configuration = new ConfigurationBuilder() - .SetBasePath(Environment.CurrentDirectory) - .AddEnvironmentVariables() - .Build(); +var builder = Host.CreateApplicationBuilder(args); +builder.Services.AddSingleton(); -var host = Host.CreateDefaultBuilder() - .ConfigureAppConfiguration(config => - { - config.AddConfiguration(configuration); - }) - .ConfigureServices((context, services) => - { - services.AddSingleton(); - }) - .Build(); +using var host = builder.Build(); var app = host.Services.GetRequiredService(); diff --git a/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/ApplicationTests.cs b/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/ApplicationTests.cs index d53593ffd2..fb66c6d8c5 100644 --- a/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/ApplicationTests.cs +++ b/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/ApplicationTests.cs @@ -1,6 +1,7 @@ using MessageTemplateForLoggingCA2254; using Microsoft.Extensions.Logging; using NSubstitute; +using System.Globalization; using System.Text.Json; using Xunit; @@ -71,10 +72,12 @@ public void WhenLogMessageWithoutFormatting_ThenShowUsernameAndTimeWithoutFormat var app = GetApplication(); app.LogMessageWithoutFormatting(_userId, _loggedInTime); + var expected = string.Create(CultureInfo.InvariantCulture, $"User {_userId} logged in at {_loggedInTime}."); + _logger.Received(1).Log( LogLevel.Information, Arg.Any(), - Arg.Is(o => o.ToString()!.Contains($"User {_userId} logged in at {_loggedInTime:MM/dd/yyyy HH:mm:ss}.")), + Arg.Is(o => o.ToString()!.Contains(expected)), Arg.Any(), Arg.Any>() ); @@ -86,10 +89,12 @@ public void WhenLogMessageWithFormatting_ThenShowUsernameAndTimeWithFormattingTe var app = GetApplication(); app.LogMessageWithFormatting(_userId, _loggedInTime); + var expected = string.Create(CultureInfo.InvariantCulture, $"User {_userId:N} logged in at {_loggedInTime:F}."); + _logger.Received(1).Log( LogLevel.Information, Arg.Any(), - Arg.Is(o => o.ToString()!.Contains($"User {_userId:N} logged in at {_loggedInTime:F}.")), + Arg.Is(o => o.ToString()!.Contains(expected)), Arg.Any(), Arg.Any>() ); @@ -132,11 +137,13 @@ public void WhenLogMessageToFixCA2254Warning_ThenShowUsernameAndTimeTest() var app = GetApplication(); app.LogMessageToFixCA2254Warning(_userName, _loggedInTime); + var expected = string.Create(CultureInfo.InvariantCulture, $"User {_userName} logged on {_loggedInTime}"); + _logger.Received(1).Log( LogLevel.Information, Arg.Any(), Arg.Is(o => - o.ToString()!.Contains($"User {_userName} logged on {_loggedInTime:MM/dd/yyyy HH:mm:ss}")), + o.ToString()!.Contains(expected)), Arg.Any(), Arg.Any>() ); diff --git a/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/Tests.csproj b/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/Tests.csproj index 718eeefe41..9e584844fd 100644 --- a/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/Tests.csproj +++ b/dotnet-logging/MessageTemplateForLoggingCA2254/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net11.0 enable enable @@ -10,15 +10,14 @@ - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all