Upgrade solution to .NET 10.0 and modernize test infrastructure (#278)

axunonb · web-flow · commit 6f8aa53ec350 · 2025-12-22T08:35:36.000+01:00
* Upgrade solution to .NET 10.0 and modernize test infrastructure

* All projects now target .NET 10.0, with NuGet packages the target .NET 10.0 only.
* Replaced types marked as obsolete in .NET 10.0 (see below)
* Integration tests have been refactored to use WebApplicationFactory instead of TestServer, and test helpers have been modernized.
* Obsolete package references were removed. Service registration and Razor runtime compilation setup were updated to align with .NET 10 best practices.
* Documentation and type references were clarified.

## Obsolete Types Replaced

### 1. **TestServer &amp; WebHostBuilder** (Test Infrastructure)
- **Obsolete:** `Microsoft.AspNetCore.TestHost.TestServer` + `Microsoft.AspNetCore.Hosting.WebHostBuilder`
- **Replaced with:** `Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory&lt;TProgram&gt;`
- **Files affected:**
  - `League.Tests\TestComponents\UnitTestHelpers.cs` — removed `GetLeagueTestServer()` method
  - `League.Tests\IntegrationTests\BasicIntegrationTests.cs` — refactored to use `WebApplicationFactory&lt;League.WebApp.Program&gt;`

### 2. **IActionContextAccessor &amp; ActionContextAccessor** (Dependency Injection)
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor`
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Infrastructure.ActionContextAccessor`
- **Replaced with:** Direct `ActionContext` creation from `IHttpContextAccessor`
- **Files affected:**
  - `League\LeagueStartup.cs` — removed registration, now inline `ActionContext` factory in `IUrlHelper` scoped service

### 3. **MvcRazorRuntimeCompilationOptions** (View Compilation)
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.MvcRazorRuntimeCompilationOptions`
- **Replaced with:** Direct `AddRazorRuntimeCompilation()` without explicit `FileProviders` configuration (auto-discovery)
- **Files affected:**
  - `League.Demo\WebAppStartup.cs` — removed `services.Configure&lt;MvcRazorRuntimeCompilationOptions&gt;(...)` block
  - Removed unnecessary `using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;` and `using Microsoft.Extensions.FileProviders;`

* Upgrade solution to .NET 10.0 and modernize test infrastructure

* All projects now target .NET 10.0, with NuGet packages the target .NET 10.0 only.
* Replaced types marked as obsolete in .NET 10.0 (see below)
* Integration tests have been refactored to use WebApplicationFactory instead of TestServer, and test helpers have been modernized.
* Obsolete package references were removed. Service registration and Razor runtime compilation setup were updated to align with .NET 10 best practices.
* Documentation and type references were clarified.

## Obsolete Types Replaced

### 1. **TestServer &amp; WebHostBuilder** (Test Infrastructure)
- **Obsolete:** `Microsoft.AspNetCore.TestHost.TestServer` + `Microsoft.AspNetCore.Hosting.WebHostBuilder`
- **Replaced with:** `Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory&lt;TProgram&gt;`
- **Files affected:**
  - `League.Tests\TestComponents\UnitTestHelpers.cs` — removed `GetLeagueTestServer()` method
  - `League.Tests\IntegrationTests\BasicIntegrationTests.cs` — refactored to use `WebApplicationFactory&lt;League.WebApp.Program&gt;`

### 2. **IActionContextAccessor &amp; ActionContextAccessor** (Dependency Injection)
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor`
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Infrastructure.ActionContextAccessor`
- **Replaced with:** Direct `ActionContext` creation from `IHttpContextAccessor`
- **Files affected:**
  - `League\LeagueStartup.cs` — removed registration, now inline `ActionContext` factory in `IUrlHelper` scoped service

### 3. **MvcRazorRuntimeCompilationOptions** (View Compilation)
- **Obsolete:** `Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.MvcRazorRuntimeCompilationOptions`
- **Replaced with:** Direct `AddRazorRuntimeCompilation()` without explicit `FileProviders` configuration (auto-discovery)
- **Files affected:**
  - `League.Demo\WebAppStartup.cs` — removed `services.Configure&lt;MvcRazorRuntimeCompilationOptions&gt;(...)` block
  - Removed unnecessary `using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;` and `using Microsoft.Extensions.FileProviders;`

* Bump version 9.0.0
diff --git a/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj b/Axuno.BackgroundTask.Test/Axuno.BackgroundTask.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj b/Axuno.BackgroundTask/Axuno.BackgroundTask.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Product>Axuno.BackgroundTask</Product>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1591</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -17,6 +17,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
   </ItemGroup>
 </Project>
diff --git a/Axuno.BackgroundTask/IBackgroundTask.cs b/Axuno.BackgroundTask/IBackgroundTask.cs
@@ -16,7 +16,7 @@ public interface IBackgroundTask
     /// <summary>
     /// Gets or sets the timeout, after which e.g. a <see cref="TimeoutException"/> should be thrown by the calling <see cref="IBackgroundQueue"/>
     /// (or any other appropriate action).
-    /// Set the timeout to <see cref="TimeSpan.FromMilliseconds"/> with value -1 indicating an infinite timeout.
+    /// Set the timeout to <see cref="TimeSpan.FromMilliseconds(double)"/> with value -1 indicating an infinite timeout.
     /// </summary>
     TimeSpan Timeout { get; set; }
-}
+}
diff --git a/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj b/Axuno.Tools.Tests/Axuno.Tools.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
diff --git a/Axuno.Tools/Axuno.Tools.csproj b/Axuno.Tools/Axuno.Tools.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Product>Axuno.Tools</Product>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/Axuno.Web/Axuno.Web.csproj b/Axuno.Web/Axuno.Web.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Product>Axuno.Web</Product>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1591</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,9 +7,9 @@
         <Copyright>Copyright 2011-$(CurrentYear) axuno gGmbH</Copyright>
         <RepositoryUrl>https://github.com/axuno/Volleyball-League</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <Version>8.3.1</Version>
-        <FileVersion>8.3.1</FileVersion>
-        <AssemblyVersion>8.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
+        <Version>9.0.0</Version>
+        <FileVersion>9.0.0</FileVersion>
+        <AssemblyVersion>9.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
diff --git a/League.Demo/League.Demo.csproj b/League.Demo/League.Demo.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <Product>League.Demo</Product>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <NeutralLanguage>en</NeutralLanguage>
     <!-- With dotnet, add parameter: -p:SatelliteResourceLanguages="""en;de""" -->
     <SatelliteResourceLanguages>en;de</SatelliteResourceLanguages>
diff --git a/League.Demo/Program.cs b/League.Demo/Program.cs
@@ -25,7 +25,7 @@ public static async Task Main(string[] args)
             
         try
         {
-            logger.Trace($"Configuration of {nameof(Microsoft.AspNetCore.WebHost)} starting.");
+            logger.Trace($"Configuration of {nameof(WebApplicationBuilder)} starting.");
             logger.Info($"This app runs as {(Environment.Is64BitProcess ? "64-bit" : "32-bit")} process.\n\n");
 
             var builder = SetupBuilder(args);
diff --git a/League.Demo/WebAppStartup.cs b/League.Demo/WebAppStartup.cs
@@ -40,15 +40,6 @@ public static void ConfigureServices(WebApplicationBuilder builder, ILoggerFacto
 
             // If you want to enable runtime compilation for other view components, you can use the following code:
             services.AddMvc().AddRazorRuntimeCompilation();
-
-            // Add runtime compilation for the League RCL
-            services.Configure<MvcRazorRuntimeCompilationOptions>(options =>
-            {
-                var leagueLibraryPath = Path.GetFullPath(
-                    Path.Combine(environment.ContentRootPath, "..", nameof(League)));
-
-                options.FileProviders.Add(new PhysicalFileProvider(leagueLibraryPath));
-            });
         }
     }
 
diff --git a/League.Tests/IntegrationTests/BasicIntegrationTests.cs b/League.Tests/IntegrationTests/BasicIntegrationTests.cs
@@ -1,30 +1,34 @@
 ﻿using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
 using NUnit.Framework;
 
-namespace League.Tests;
+namespace League.Tests.IntegrationTests;
 
+/// <summary>
+/// Integration tests using League.WebApp.Program (aka the demo) as the host application.
+/// </summary>
 [TestFixture]
 public class BasicIntegrationTests
 {
-    private readonly WebApplicationFactory<League.WebApp.Program> _factory;
+    private WebApplicationFactory<WebApp.Program>? _factory;
 
-    [OneTimeTearDown]
-    public void DisposeWebApplicationFactory()
+    [OneTimeSetUp]
+    public void Setup()
     {
-        _factory.Dispose();
+        // Create a test factory using League.WebApp.Program (aka the demo) as the host
+        _factory = UnitTestHelpers.GetLeagueTestApplicationFactory<WebApp.Program>()
+            .WithWebHostBuilder(builder =>
+            {
+                builder.ConfigureServices(services =>
+                {
+                    // Add test-specific service overrides here if needed
+                });
+            });
     }
 
-    public BasicIntegrationTests()
+    [OneTimeTearDown]
+    public void TearDown()
     {
-        _factory = new WebApplicationFactory<League.WebApp.Program>()
-                .WithWebHostBuilder(
-                    builder =>
-                    {
-                        builder.ConfigureTestServices(services =>
-                        {
-                        });
-                    });
+        _factory?.Dispose();
     }
 
     [TestCase("/")]
@@ -33,7 +37,8 @@ public BasicIntegrationTests()
     public async Task Get_EndpointsReturnSuccessAndCorrectContentType(string url)
     {
         // Arrange
-        var client = _factory.CreateClient();
+        Assert.That(_factory, Is.Not.Null, "WebApplicationFactory must be initialized");
+        var client = _factory!.CreateClient();
 
         // Act
         var response = await client.GetAsync(url);
diff --git a/League.Tests/League.Tests.csproj b/League.Tests/League.Tests.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.22" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
     <PackageReference Include="FluentAssertions" Version="8.8.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.22" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="ObjectsComparer" Version="1.4.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
diff --git a/League.Tests/TestComponents/UnitTestHelpers.cs b/League.Tests/TestComponents/UnitTestHelpers.cs
@@ -4,9 +4,8 @@
 using League.Identity;
 using League.Tests.TestComponents;
 using League.TextTemplatingModule;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -82,7 +81,7 @@ public UserStore GetUserStore()
 
     public RoleStore GetRoleStore()
     {
-        return new League.Identity.RoleStore(_tenantContext, new NullLogger<League.Identity.RoleStore>(), new UpperInvariantLookupNormalizer(), new Mock<MultiLanguageIdentityErrorDescriber>(null!).Object);
+        return new RoleStore(_tenantContext, new NullLogger<League.Identity.RoleStore>(), new UpperInvariantLookupNormalizer(), new Mock<MultiLanguageIdentityErrorDescriber>(null!).Object);
     }
 
     public ServiceProvider GetStandardServiceProvider()
@@ -118,11 +117,11 @@ public static ServiceProvider GetTextTemplatingServiceProvider(ITenantContext te
                 "Europe/Berlin", CultureInfo.CurrentCulture))
             .AddTransient<ITenantContext>(sp => tenantContext)
             .AddTextTemplatingModule(vfs =>
-                {
-                    // The complete Templates folder is embedded in the project file
-                    vfs.FileSets.AddEmbedded<LeagueTemplateRenderer>(nameof(League) + ".Templates");
-                    // To use physical files: vfs.FileSets.AddPhysical(Path.Combine(Directory.GetCurrentDirectory(), "Templates"));
-                },
+            {
+                // The complete Templates folder is embedded in the project file
+                vfs.FileSets.AddEmbedded<LeagueTemplateRenderer>(nameof(League) + ".Templates");
+                // To use physical files: vfs.FileSets.AddPhysical(Path.Combine(Directory.GetCurrentDirectory(), "Templates"));
+            },
                 locOpt =>
                 {
                 },
@@ -134,7 +133,7 @@ public static ServiceProvider GetTextTemplatingServiceProvider(ITenantContext te
             .BuildServiceProvider();
     }
 
-    public static ServiceProvider GetReportSheetCacheServiceProvider(ITenantContext tenantContext, IWebHostEnvironment webHostEnvironment, IEnumerable<KeyValuePair<string,string?>> browserPath)
+    public static ServiceProvider GetReportSheetCacheServiceProvider(ITenantContext tenantContext, Microsoft.AspNetCore.Hosting.IWebHostEnvironment webHostEnvironment, IEnumerable<KeyValuePair<string, string?>> browserPath)
     {
         return new ServiceCollection()
             .AddLogging(builder =>
@@ -153,28 +152,45 @@ public static ServiceProvider GetReportSheetCacheServiceProvider(ITenantContext
                 return c;
             })
             .AddTransient<ITenantContext>(sp => tenantContext)
-            .AddTransient<IWebHostEnvironment>(sp => webHostEnvironment)
+            .AddTransient<Microsoft.AspNetCore.Hosting.IWebHostEnvironment>(sp => webHostEnvironment)
             .AddTransient<ReportSheetCache>()
             .AddLocalization()
             .BuildServiceProvider();
     }
 
-
-    public static TestServer GetLeagueTestServer()
+    /// <summary>
+    /// Creates a test application factory for integration testing with .NET 10.
+    /// Requires a Program class from the host application.
+    /// </summary>
+    /// <typeparam name="T">The Program class entry point of the application being tested.</typeparam>
+    /// <returns>WebApplicationFactory configured for testing.</returns>
+    public static WebApplicationFactory<T> GetLeagueTestApplicationFactory<T>()
+        where T : class
     {
-        var server = new TestServer(new Microsoft.AspNetCore.Hosting.WebHostBuilder());
+        return new WebApplicationFactory<T>();
+    }
 
-        return server;
+    /// <summary>
+    /// Creates an HttpClient for testing via WebApplicationFactory.
+    /// </summary>
+    /// <typeparam name="TProgram">The Program class entry point of the application being tested.</typeparam>
+    /// <param name="factory">The WebApplicationFactory used to create the client. The caller is responsible for disposing this factory.</param>
+    /// <returns>HttpClient connected to the test server.</returns>
+    public static HttpClient GetLeagueTestHttpClient<TProgram>(out WebApplicationFactory<TProgram> factory)
+        where TProgram : class
+    {
+        factory = GetLeagueTestApplicationFactory<TProgram>();
+        return factory.CreateClient();
     }
 
     private void HowToUseServices()
     {
         var logger = (Microsoft.Extensions.Logging.ILogger) GetStandardServiceProvider().GetRequiredService(typeof(ILogger<UnitTestHelpers>));
         logger.LogError("error");
-        var localizer = (IStringLocalizer)GetStandardServiceProvider().GetRequiredService(typeof(IStringLocalizer<League.Controllers.Account>));
+        var localizer = (IStringLocalizer) GetStandardServiceProvider().GetRequiredService(typeof(IStringLocalizer<League.Controllers.Account>));
         _ = localizer["This is your password recovery key"].Value;
 
-        var mlLoc = new MultiLanguageIdentityErrorDescriber((IStringLocalizer<MultiLanguageIdentityErrorDescriberResource>)GetStandardServiceProvider().GetRequiredService(typeof(IStringLocalizer<MultiLanguageIdentityErrorDescriberResource>)));
+        var mlLoc = new MultiLanguageIdentityErrorDescriber((IStringLocalizer<MultiLanguageIdentityErrorDescriberResource>) GetStandardServiceProvider().GetRequiredService(typeof(IStringLocalizer<MultiLanguageIdentityErrorDescriberResource>)));
         _ = mlLoc.ConcurrencyFailure().Description;
     }
 }
diff --git a/League/League.csproj b/League/League.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
     <PropertyGroup>
         <Product>Volleyball-League</Product>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <AssemblyName>League</AssemblyName>
         <RootNamespace>League</RootNamespace>
         <UserSecretsId>ceea2bf6-8147-49b9-be85-26fca01f9ed3</UserSecretsId>
@@ -67,16 +67,16 @@ Localizations for English and German are included. The library is in operation o
         <PackageReference Include="Axuno.TextTemplating" Version="3.0.0" />
         <PackageReference Include="JSNLog" Version="3.0.3" />
         <PackageReference Include="MailMergeLib" Version="5.13.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.22" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.22" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.22" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.22" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="10.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="10.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.1" />
         <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="NLog" Version="5.5.1" />
         <PackageReference Include="NLog.Web.AspNetCore" Version="5.5.0" />
@@ -86,9 +86,7 @@ Localizations for English and German are included. The library is in operation o
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="StackifyMiddleware" Version="3.3.3.4767" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.0" />
-        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+        <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
     </ItemGroup>
     <ItemGroup>
         <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
@@ -260,4 +258,4 @@ Localizations for English and German are included. The library is in operation o
     <PropertyGroup Condition=" '$(Configuration)' != '' AND '$(Configuration)' != 'Debug' ">
         <EnvironmentName>Production</EnvironmentName>
     </PropertyGroup>
-</Project>
+</Project>
diff --git a/League/LeagueStartup.cs b/League/LeagueStartup.cs
@@ -22,7 +22,7 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.WebUtilities;
@@ -174,10 +174,18 @@ public static void ConfigureServices(WebApplicationBuilder builder, ILoggerFacto
         services.Configure<IISOptions>(options => { });
 
         services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-        services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
         // Make UrlHelper injectable to any component in the HttpContext
         services.AddScoped<IUrlHelper>(sp => {
-            var actionContext = sp.GetRequiredService<IActionContextAccessor>().ActionContext!;
+            var httpContextAccessor = sp.GetRequiredService<IHttpContextAccessor>();
+            if (httpContextAccessor.HttpContext is null)
+            {
+                throw new InvalidOperationException(
+                    "HttpContext is not available. IUrlHelper can only be resolved within an active HTTP request context.");
+            }
+            var actionContext = new ActionContext(
+                httpContextAccessor.HttpContext,
+                httpContextAccessor.HttpContext.GetRouteData(),
+                new ActionDescriptor());
             var factory = sp.GetRequiredService<IUrlHelperFactory>();
             return factory.GetUrlHelper(actionContext);
         });
diff --git a/README.md b/README.md
diff --git a/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj b/TournamentManager/DAL/DatabaseGeneric/TournamentManager.DAL.DbGeneric.csproj
diff --git a/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj b/TournamentManager/DAL/DatabaseSpecific/TournamentManager.DAL.DBSpecific.csproj
diff --git a/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj b/TournamentManager/TournamentManager.Tests/TournamentManager.Tests.csproj
diff --git a/TournamentManager/TournamentManager/TournamentManager.csproj b/TournamentManager/TournamentManager/TournamentManager.csproj

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static async Task Main(string[] args)`
`25`	`25`
`26`	`26`	`try`
`27`	`27`	`{`
`28`		`- logger.Trace($"Configuration of {nameof(Microsoft.AspNetCore.WebHost)} starting.");`
	`28`	`+ logger.Trace($"Configuration of {nameof(WebApplicationBuilder)} starting.");`
`29`	`29`	`logger.Info($"This app runs as {(Environment.Is64BitProcess ? "64-bit" : "32-bit")} process.\n\n");`
`30`	`30`
`31`	`31`	`var builder = SetupBuilder(args);`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,6 @@ public static void ConfigureServices(WebApplicationBuilder builder, ILoggerFacto`
`40`	`40`
`41`	`41`	`// If you want to enable runtime compilation for other view components, you can use the following code:`
`42`	`42`	`services.AddMvc().AddRazorRuntimeCompilation();`
`43`		`-`
`44`		`- // Add runtime compilation for the League RCL`
`45`		`- services.Configure<MvcRazorRuntimeCompilationOptions>(options =>`
`46`		`- {`
`47`		`- var leagueLibraryPath = Path.GetFullPath(`
`48`		`- Path.Combine(environment.ContentRootPath, "..", nameof(League)));`
`49`		`-`
`50`		`- options.FileProviders.Add(new PhysicalFileProvider(leagueLibraryPath));`
`51`		`- });`
`52`	`43`	`}`
`53`	`44`	`}`
`54`	`45`