V10: fix build warnings in test projects (#12509)
* Run code cleanup * Dotnet format benchmarks project * Fix up Test.Common * Run dotnet format + manual cleanup * Run code cleanup for unit tests * Run dotnet format * Fix up errors * Manual cleanup of Unit test project * Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Fix according to review * Fix after merge * Fix errors Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
@@ -2,27 +2,25 @@
|
||||
// See LICENSE for more details.
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Umbraco.Cms.Tests.Integration.Implementations;
|
||||
|
||||
namespace Umbraco.Cms.Tests.Integration.Extensions
|
||||
namespace Umbraco.Cms.Tests.Integration.Extensions;
|
||||
|
||||
public static class ServiceCollectionExtensions
|
||||
{
|
||||
public static class ServiceCollectionExtensions
|
||||
/// <summary>
|
||||
/// These services need to be manually added because they do not get added by the generic host
|
||||
/// </summary>
|
||||
public static void AddRequiredNetCoreServices(this IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
|
||||
{
|
||||
/// <summary>
|
||||
/// These services need to be manually added because they do not get added by the generic host
|
||||
/// </summary>
|
||||
public static void AddRequiredNetCoreServices(this IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
|
||||
{
|
||||
services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
|
||||
services.AddSingleton(x => testHelper.GetHttpContextAccessor());
|
||||
|
||||
// The generic host does add IHostEnvironment but not this one because we are not actually in a web context
|
||||
services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
|
||||
// The generic host does add IHostEnvironment but not this one because we are not actually in a web context
|
||||
services.AddSingleton(x => webHostEnvironment);
|
||||
|
||||
// Replace the IHostEnvironment that generic host created too
|
||||
services.AddSingleton<IHostEnvironment>(x => webHostEnvironment);
|
||||
}
|
||||
// Replace the IHostEnvironment that generic host created too
|
||||
services.AddSingleton<IHostEnvironment>(x => webHostEnvironment);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user