Skip to content

Commit

Permalink
Update Package Dependencies and Startup Classes
Browse files Browse the repository at this point in the history
This commit includes the following changes:

#### 1. Unit Test Helpers Enhancements:
- Updated the `LeagueStartup` and `UnitTestHelpers` class to improve initialization and configuration of services for unit tests.
- Ensured the database connection is properly opened and closed during initialization.
- Enhanced logging configuration to capture message templates and properties using NLog.
- Added localization support to the service provider for better handling of localized strings in tests.
- Improved the `GetStandardServiceProvider` method to include additional services required for testing.

#### 2. Package Updates:
- Updated `Microsoft.Extensions.Logging` from `5.0.0` to `6.0.0`.
- Updated `NLog.Extensions.Logging` from `5.0.0` to `6.0.0`.
- Updated `Microsoft.AspNetCore.TestHost` from `5.0.0` to `6.0.0`.
- Added reference to `Microsoft.Data.SqlClient` `5.2.2`, replacing obsolete classes in `System.Data.SqlClient`.

#### 3. Code Cleanup:
- Removed unused namespaces and organized using directives for better readability.
- Added XML documentation comments to public methods and properties for better code documentation.
  • Loading branch information
axunonb committed Jan 6, 2025
1 parent cb22586 commit efdbf80
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 41 deletions.
8 changes: 4 additions & 4 deletions Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="nunit" Version="4.2.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="nunit" Version="4.3.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Axuno.BackgroundTask\Axuno.BackgroundTask.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions Axuno.BackgroundTask/Axuno.BackgroundTask.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</AssemblyAttribute>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cronos" Version="0.8.4" />
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="Cronos" Version="0.9.0" />
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Axuno.Tools.Tests/Axuno.Tools.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
<EmbeddedResource Include="FileSystem\Data\my-json-file.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="nunit" Version="4.2.2" />
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="nunit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Axuno.Tools\Axuno.Tools.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Axuno.Tools/Axuno.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions Axuno.Web/Axuno.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.1.2" />
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions League.Tests/League.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.13.0" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="ObjectsComparer" Version="1.4.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\League.Demo\League.Demo.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion League.Tests/TestComponents/UnitTestHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private void InitializeLlBlGenPro()
{
RuntimeConfiguration.ConfigureDQE<SD.LLBLGen.Pro.DQE.SqlServer.SQLServerDQEConfiguration>(c => c
.SetTraceLevel(System.Diagnostics.TraceLevel.Verbose)
.AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory)));
.AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory)));

RuntimeConfiguration.Tracing.SetTraceLevel("ORMPersistenceExecution", System.Diagnostics.TraceLevel.Verbose);
RuntimeConfiguration.Tracing.SetTraceLevel("ORMPlainSQLQueryExecution", System.Diagnostics.TraceLevel.Verbose);
Expand Down
9 changes: 4 additions & 5 deletions League/League.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,18 @@ Localizations for English and German are included. The library is in operation o
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<PackEmbeddedResource>true</PackEmbeddedResource>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="StackifyMiddleware" Version="3.3.3.4767" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions League/LeagueStartup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ private static void ConfigureLLblGenPro(TenantStore tenantStore, IWebHostEnviron
{
RuntimeConfiguration.ConfigureDQE<SD.LLBLGen.Pro.DQE.SqlServer.SQLServerDQEConfiguration>(c => c
.SetTraceLevel(TraceLevel.Off)
.AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory)));
.AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory)));
}
else
{
RuntimeConfiguration.ConfigureDQE<SD.LLBLGen.Pro.DQE.SqlServer.SQLServerDQEConfiguration>(c => c
.SetTraceLevel(TraceLevel.Verbose)
.AddDbProviderFactory(typeof(System.Data.SqlClient.SqlClientFactory)));
.AddDbProviderFactory(typeof(Microsoft.Data.SqlClient.SqlClientFactory)));

RuntimeConfiguration.Tracing.SetTraceLevel("ORMPersistenceExecution", TraceLevel.Verbose);
RuntimeConfiguration.Tracing.SetTraceLevel("ORMPlainSQLQueryExecution", TraceLevel.Verbose);
Expand Down
2 changes: 1 addition & 1 deletion League/Middleware/ClientAbortMiddleware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
// If the cancellation token has not been requested,
// it means that the exception was caused by the client closing the connection.
// Note: SqlException with message "Operation cancelled by user may throw, too, but rarely.
catch (Exception ex) when (ex is TaskCanceledException or SqlException && context.RequestAborted.IsCancellationRequested)
catch (Exception ex) when (ex is TaskCanceledException or Microsoft.Data.SqlClient.SqlException && context.RequestAborted.IsCancellationRequested)
{
// Log the exception and stop the request queue.
_logger.LogWarning(ex, "Request aborted by client. Processing stops.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<NoWarn>CA5362;CS1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="FluentAssertions" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
13 changes: 7 additions & 6 deletions TournamentManager/TournamentManager/TournamentManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ Volleyball League is an open source sports platform that brings everything neces
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EPPlus" Version="7.4.1" />
<PackageReference Include="EPPlus" Version="7.5.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NuGetizer" Version="1.2.3">
<PackageReference Include="NuGetizer" Version="1.2.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OxyPlot.Core" Version="2.2.0" />
<PackageReference Include="OxyPlot.SkiaSharp" Version="2.2.0" />
<PackageReference Include="PuppeteerSharp" Version="20.0.2" />
<PackageReference Include="PuppeteerSharp" Version="20.0.5" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<!-- Replace original Ical.Net v4.2.0 with more up-to-date fork -->
<PackageReference Include="Ical.Net" Version="4.3.1" />
<PackageReference Include="libphonenumber-csharp" Version="8.13.47" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.14" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="libphonenumber-csharp" Version="8.13.52" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="YAXLib" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit efdbf80

Please sign in to comment.