yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UmbracoBuilder now requires TypeLoader via ctor

Browse Source
This commit is contained in:
Paul Johnson
2020-11-20 11:48:32 +00:00
parent 5b1ccb0659
commit 39657dea6d
20 changed files with 106 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Builder/IUmbracoBuilder.cs
View File

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Builder
{
IServiceCollection Services { get; }
IConfiguration Config { get; }
TypeLoader TypeLoader { get; set; } // TODO: Remove setter, see note on concrete
TypeLoader TypeLoader { get; }
ILoggerFactory BuilderLoggerFactory { get; }
TBuilder WithCollectionBuilder<TBuilder>() where TBuilder : ICollectionBuilder, new();
void Build();

16
src/Umbraco.Core/Builder/UmbracoBuilder.cs
View File

@@ -13,27 +13,23 @@ namespace Umbraco.Web.Common.Builder
{
private readonly Dictionary<Type, ICollectionBuilder> _builders = new Dictionary<Type, ICollectionBuilder>();
public UmbracoBuilder(IServiceCollection services, IConfiguration config)
: this(services, config, NullLoggerFactory.Instance)
public UmbracoBuilder(IServiceCollection services, IConfiguration config, TypeLoader typeLoader)
: this(services, config, typeLoader, NullLoggerFactory.Instance)
{ }
public UmbracoBuilder(IServiceCollection services, IConfiguration config, ILoggerFactory loggerFactory)
public UmbracoBuilder(IServiceCollection services, IConfiguration config, TypeLoader typeLoader, ILoggerFactory loggerFactory)
{
Services = services;
Config = config;
BuilderLoggerFactory = loggerFactory;
TypeLoader = typeLoader;
}
public IServiceCollection Services { get; }
public IConfiguration Config { get; }
/// <remarks>
/// TODO: Remove setter
/// This should be a constructor parameter
/// Attempting to fix it now opens a huge can of worms around logging setup
/// &amp; use of IOptionsMoniker&lt;HostingSettings&gt; for AspNetCoreHostingEnvironment
/// </remarks>
public TypeLoader TypeLoader { get; set; }
public TypeLoader TypeLoader { get; }
public ILoggerFactory BuilderLoggerFactory { get; }
/// <summary>

3
src/Umbraco.Core/Logging/ProfilingLogger.cs
View File

@@ -23,6 +23,9 @@ namespace Umbraco.Core.Logging
/// <summary>
/// Initializes a new instance of the <see cref="ProfilingLogger"/> class.
/// </summary>
public ProfilingLogger(ILogger<ProfilingLogger> logger, IProfiler profiler) : this(logger as ILogger, profiler)
{ }
public ProfilingLogger(ILogger logger, IProfiler profiler)
{
Logger = logger ?? throw new ArgumentNullException(nameof(logger));

20
src/Umbraco.Tests.Integration/RuntimeTests.cs
View File

@@ -61,10 +61,13 @@ namespace Umbraco.Tests.Integration
services.AddRequiredNetCoreServices(testHelper, webHostEnvironment);
// Add it!
var builder = new UmbracoBuilder(services, hostContext.Configuration, testHelper.ConsoleLoggerFactory);
var typeLoader = UmbracoCoreServiceCollectionExtensions.CreateTypeLoader(GetType().Assembly, webHostEnvironment,
testHelper.ConsoleLoggerFactory, AppCaches.NoCache, hostContext.Configuration);
var builder = new UmbracoBuilder(services, hostContext.Configuration, typeLoader, testHelper.ConsoleLoggerFactory);
builder.Services.AddUnique<AppCaches>(AppCaches.NoCache);
builder.AddConfiguration();
builder.AddUmbracoCore(webHostEnvironment, GetType().Assembly, AppCaches.NoCache, testHelper.GetLoggingConfiguration(), hostContext.Configuration);
builder.AddUmbracoCore(webHostEnvironment, GetType().Assembly, testHelper.GetLoggingConfiguration(), hostContext.Configuration);
});
var host = await hostBuilder.StartAsync();
@@ -99,12 +102,17 @@ namespace Umbraco.Tests.Integration
var webHostEnvironment = testHelper.GetWebHostEnvironment();
services.AddSingleton(testHelper.DbProviderFactoryCreator);
services.AddRequiredNetCoreServices(testHelper, webHostEnvironment);
// Add it!
var builder = new UmbracoBuilder(services, hostContext.Configuration, testHelper.ConsoleLoggerFactory);
var typeLoader = UmbracoCoreServiceCollectionExtensions.CreateTypeLoader(GetType().Assembly,
webHostEnvironment, testHelper.ConsoleLoggerFactory, AppCaches.NoCache,
hostContext.Configuration);
var builder = new UmbracoBuilder(services, hostContext.Configuration, typeLoader, testHelper.ConsoleLoggerFactory);
builder.Services.AddUnique<AppCaches>(AppCaches.NoCache);
builder.AddConfiguration()
.AddUmbracoCore(webHostEnvironment, GetType().Assembly, AppCaches.NoCache, testHelper.GetLoggingConfiguration(), hostContext.Configuration)
.AddUmbracoCore(webHostEnvironment, GetType().Assembly, testHelper.GetLoggingConfiguration(), hostContext.Configuration)
.Build();
services.AddRouting(); // LinkGenerator

3
src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
View File

@@ -20,10 +20,11 @@ namespace Umbraco.Tests.Integration.TestServerTest
builder.AddUmbracoCore(
testHelper.GetWebHostEnvironment(),
typeof(UmbracoBuilderExtensions).Assembly,
AppCaches.NoCache, // Disable caches in integration tests
testHelper.GetLoggingConfiguration(),
builder.Config);
builder.Services.AddUnique<AppCaches>(AppCaches.NoCache);
builder.Services.AddUnique<IUmbracoBootPermissionChecker>(Mock.Of<IUmbracoBootPermissionChecker>());
builder.Services.AddUnique<IMainDom>(testHelper.MainDom);

4
src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
View File

@@ -21,6 +21,7 @@ using Umbraco.Web;
using Umbraco.Web.Common.Builder;
using Umbraco.Web.Common.Controllers;
using Microsoft.Extensions.Hosting;
using Umbraco.Core.Cache;
using Umbraco.Core.Persistence;
using Umbraco.Core.Runtime;
using Umbraco.Web.BackOffice.Controllers;
@@ -129,7 +130,8 @@ namespace Umbraco.Tests.Integration.TestServerTest
public override void ConfigureServices(IServiceCollection services)
{
var umbracoBuilder = services.AddUmbraco(TestHelper.GetWebHostEnvironment(), Configuration);
var umbracoBuilder = services.AddUmbraco(TestHelper.GetWebHostEnvironment(), Configuration, assembly: GetType().Assembly);
umbracoBuilder
.AddConfiguration()
.AddTestCore(TestHelper) // This is the important one!

10
src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
View File

@@ -128,7 +128,6 @@ namespace Umbraco.Tests.Integration.Testing
catch
{
// ignored
Debugger.Break();
}
return NullLoggerFactory.Instance;
@@ -175,16 +174,21 @@ namespace Umbraco.Tests.Integration.Testing
// Add it!
var builder = new UmbracoBuilder(services, Configuration);
var typeLoader = UmbracoCoreServiceCollectionExtensions.CreateTypeLoader(GetType().Assembly, webHostEnvironment, TestHelper.ConsoleLoggerFactory, AppCaches.NoCache, Configuration);
var builder = new UmbracoBuilder(services, Configuration, typeLoader, TestHelper.ConsoleLoggerFactory);
builder.AddConfiguration()
.AddUmbracoCore(
webHostEnvironment,
GetType().Assembly,
GetAppCaches(),
TestHelper.GetLoggingConfiguration(),
Configuration
);
builder.Services.AddUnique<AppCaches>(GetAppCaches());
builder.Services.AddUnique<IUmbracoBootPermissionChecker>(Mock.Of<IUmbracoBootPermissionChecker>());
builder.Services.AddUnique<IMainDom>(TestHelper.MainDom);

1
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
View File

@@ -44,6 +44,7 @@ namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Scoping
return result;
}
[TearDown]
public void Teardown()
{

4
src/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
View File

@@ -34,8 +34,8 @@ namespace Umbraco.Tests.TestHelpers
var container = TestHelper.GetServiceCollection();
var typeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<MapperCollectionBuilder>()
.AddCoreMappers();

29
src/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
View File

@@ -77,8 +77,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Boot1A()
{
var register = MockRegister();
var typeLoader = MockTypeLoader();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer1, Composer2, Composer4>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -118,7 +117,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Boot1B()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer1, Composer2, Composer3, Composer4>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -134,7 +133,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Boot2()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer20, Composer21>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -149,7 +148,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Boot3()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer22, Composer24, Composer25>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -166,7 +165,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void BrokenRequire()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer1, Composer2, Composer3>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -189,7 +188,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void BrokenRequired()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = TypeArray<Composer2, Composer4, Composer13>();
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -226,7 +225,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
throw new NotSupportedException(type.FullName);
});
});
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer1), typeof(Composer5), typeof(Composer5a) };
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -252,7 +251,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Requires1()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer6), typeof(Composer7), typeof(Composer8) };
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -267,7 +266,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void Requires2A()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -284,7 +283,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
var register = MockRegister();
var typeLoader = MockTypeLoader();
var factory = MockFactory();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -303,7 +302,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void WeakDependencies()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer10) };
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -342,7 +341,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void DisableMissing()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer6), typeof(Composer8) }; // 8 disables 7 which is not in the list
var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<Composers>>());
@@ -357,7 +356,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
public void AttributesPriorities()
{
var register = MockRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var types = new[] { typeof(Composer26) };
var enableDisableAttributes = new[] { new DisableComposerAttribute(typeof(Composer26)) };
@@ -383,7 +382,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Components
var typeLoader = new TypeLoader(typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<ILogger<TypeLoader>>(), Mock.Of<IProfilingLogger>());
var register = MockRegister();
var builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
var builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var allComposers = typeLoader.GetTypes<IComposer>().ToList();

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void Setup()
{
var register = TestHelper.GetServiceCollection();
_composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
_composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
}
[TearDown]

18
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs
View File

@@ -31,8 +31,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void LazyCollectionBuilderHandlesTypes()
{
var container = CreateRegister();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<TestCollectionBuilder>()
.Add<TransientObject3>()
@@ -58,8 +58,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void LazyCollectionBuilderHandlesProducers()
{
var container = CreateRegister();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<TestCollectionBuilder>()
.Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
@@ -84,8 +84,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void LazyCollectionBuilderHandlesTypesAndProducers()
{
var container = CreateRegister();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<TestCollectionBuilder>()
.Add<TransientObject3>()
@@ -111,8 +111,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void LazyCollectionBuilderThrowsOnIllegalTypes()
{
var container = CreateRegister();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<TestCollectionBuilder>()
.Add<TransientObject3>()
@@ -134,8 +133,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
public void LazyCollectionBuilderCanExcludeTypes()
{
var container = CreateRegister();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<TestCollectionBuilder>()
.Add<TransientObject3>()

4
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/PackageActionCollectionTests.cs
View File

@@ -25,8 +25,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Core.Composing
{
var container = TestHelper.GetServiceCollection();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
var expectedPackageActions = TypeLoader.GetPackageActions();
composition.WithCollectionBuilder<PackageActionCollectionBuilder>()

5
src/Umbraco.Tests/IO/FileSystemsTests.cs
View File

@@ -34,9 +34,8 @@ namespace Umbraco.Tests.IO
{
_register = TestHelper.GetRegister();
var composition = new UmbracoBuilder(_register, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(_register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.Services.AddTransient(_ => Mock.Of<IDataTypeService>());
composition.Services.AddTransient<ILoggerFactory, NullLoggerFactory>();
composition.Services.AddTransient(typeof(ILogger<>), typeof(Logger<>));

3
src/Umbraco.Tests/Published/ConvertersTests.cs
View File

@@ -37,8 +37,7 @@ namespace Umbraco.Tests.Published
// Current.Reset();
var register = TestHelper.GetRegister();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
.Append<SimpleConverter3A>()

3
src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
View File

@@ -40,8 +40,7 @@ namespace Umbraco.Tests.Scoping
var services = TestHelper.GetRegister();
var composition = new UmbracoBuilder(services, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(services, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
_testObjects = new TestObjects(services);

4
src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
View File

@@ -48,8 +48,8 @@ namespace Umbraco.Tests.TestHelpers
logger,
false);
var composition = new UmbracoBuilder(services, Mock.Of<IConfiguration>());
composition.TypeLoader = TestHelper.GetMockedTypeLoader();
var composition = new UmbracoBuilder(services, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
services.AddUnique<ILogger>(_ => Mock.Of<ILogger>());
services.AddUnique<ILoggerFactory>(_ => NullLoggerFactory.Instance);

6
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -207,11 +207,7 @@ namespace Umbraco.Tests.Testing
var services = TestHelper.GetRegister();
Builder = new UmbracoBuilder(services, Mock.Of<IConfiguration>())
{
TypeLoader = typeLoader
};
Builder = new UmbracoBuilder(services, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
//TestHelper.GetConfigs().RegisterWith(register);
services.AddUnique(typeof(ILoggerFactory), loggerFactory);

29
src/Umbraco.Web.Common/Builder/UmbracoBuilderExtensions.cs
View File

@@ -37,7 +37,8 @@ namespace Umbraco.Web.Common.Builder
IWebHostEnvironment webHostEnvironment,
IConfiguration config,
ILoggingConfiguration loggingConfig = null,
ILoggerFactory loggerFactory = null)
ILoggerFactory loggerFactory = null,
Assembly assembly = null)
{
if (services is null) throw new ArgumentNullException(nameof(services));
if (config is null) throw new ArgumentNullException(nameof(config));
@@ -47,10 +48,22 @@ namespace Umbraco.Web.Common.Builder
loggingConfig ??= new LoggingConfiguration(Path.Combine(webHostEnvironment.ContentRootPath, "umbraco", "logs"));
services.AddLogger(loggingConfig, config);
loggerFactory ??= LoggerFactory.Create(cfg => cfg.AddSerilog(Log.Logger, false));
assembly ??= Assembly.GetEntryAssembly();
IHttpContextAccessor httpContextAccessor = new HttpContextAccessor();
services.AddSingleton<IHttpContextAccessor>(httpContextAccessor);
return new UmbracoBuilder(services, config, loggerFactory);
var requestCache = new GenericDictionaryRequestAppCache(() => httpContextAccessor.HttpContext?.Items);
var appCaches = new AppCaches(
new DeepCloneAppCache(new ObjectCacheAppCache()),
requestCache,
new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
services.AddUnique<AppCaches>(appCaches);
var typeLoader = UmbracoCoreServiceCollectionExtensions.CreateTypeLoader(assembly, webHostEnvironment, loggerFactory, appCaches, config);
return new UmbracoBuilder(services, config, typeLoader, loggerFactory);
}
public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
@@ -92,19 +105,11 @@ namespace Umbraco.Web.Common.Builder
{
var loggingConfig = new LoggingConfiguration(Path.Combine(webHostEnvironment.ContentRootPath, "umbraco", "logs"));
IHttpContextAccessor httpContextAccessor = new HttpContextAccessor();
builder.Services.AddSingleton<IHttpContextAccessor>(httpContextAccessor);
builder.Services.AddSingleton<ILoggingConfiguration>(loggingConfig);
var requestCache = new GenericDictionaryRequestAppCache(() => httpContextAccessor.HttpContext?.Items);
var appCaches = new AppCaches(
new DeepCloneAppCache(new ObjectCacheAppCache()),
requestCache,
new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
builder.Services.AddSingleton<ILoggingConfiguration>(loggingConfig);
builder.AddUmbracoCore(webHostEnvironment,
Assembly.GetEntryAssembly(),
appCaches,
loggingConfig,
builder.Config);

38
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -53,7 +53,6 @@ namespace Umbraco.Extensions
this IUmbracoBuilder builder,
IWebHostEnvironment webHostEnvironment,
Assembly entryAssembly,
AppCaches appCaches,
ILoggingConfiguration loggingConfiguration,
IConfiguration configuration)
{
@@ -78,6 +77,9 @@ namespace Umbraco.Extensions
builder.Services.AddUmbracoSqlCeSupport(syntaxProviders, insertProviders, databaseCreators);
builder.Services.AddUmbracoSqlServerSupport(syntaxProviders, insertProviders, databaseCreators);
builder.Services.AddUnique<IAppPolicyCache>(factory => factory.GetRequiredService<AppCaches>().RuntimeCache);
builder.Services.AddUnique<IRequestCache>(factory => factory.GetRequiredService<AppCaches>().RequestCache);
var dbProviderFactoryCreator = new DbProviderFactoryCreator(
DbProviderFactories.GetFactory,
syntaxProviders,
@@ -93,16 +95,12 @@ namespace Umbraco.Extensions
var profiler = GetWebProfiler(configuration);
builder.Services.AddUnique<IProfiler>(profiler);
var profilingLogger = new ProfilingLogger(builder.BuilderLoggerFactory.CreateLogger<ProfilingLogger>(), profiler);
builder.Services.AddUnique<IProfilingLogger>(profilingLogger);
var typeFinder = CreateTypeFinder(loggerFactory, webHostEnvironment, entryAssembly, builder.Config);
builder.Services.AddUnique<IProfilingLogger,ProfilingLogger>();
builder.Services.AddUnique<ITypeFinder>(typeFinder);
var typeLoader = CreateTypeLoader(typeFinder, webHostEnvironment, loggerFactory, profilingLogger, appCaches.RuntimeCache, configuration);
builder.TypeLoader = typeLoader;
builder.Services.AddUnique<TypeLoader>(typeLoader);
builder.Services.AddUnique<TypeLoader>(builder.TypeLoader);
builder.Services.AddUnique<IBackOfficeInfo, AspNetCoreBackOfficeInfo>();
// after bootstrapping we let the container wire up for us.
@@ -110,8 +108,6 @@ namespace Umbraco.Extensions
builder.Services.AddUnique<ISqlContext>(factory => factory.GetRequiredService<IUmbracoDatabaseFactory>().SqlContext);
builder.Services.AddUnique<IBulkSqlInsertProvider>(factory => factory.GetRequiredService<IUmbracoDatabaseFactory>().BulkSqlInsertProvider);
builder.Services.AddUnique<AppCaches>(appCaches);
builder.Services.AddUnique<IRequestCache>(appCaches.RequestCache);
builder.Services.AddUnique<IUmbracoVersion, UmbracoVersion>();
builder.Services.AddUnique<IDbProviderFactoryCreator>(dbProviderFactoryCreator);
@@ -125,8 +121,8 @@ namespace Umbraco.Extensions
var connectionStrings = factory.GetRequiredService<IOptions<ConnectionStrings>>().Value;
var hostingEnvironment = factory.GetRequiredService<IHostingEnvironment>();
var dbCreator = factory.GetRequiredService<IDbProviderFactoryCreator>()
; var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
var dbCreator = factory.GetRequiredService<IDbProviderFactoryCreator>();
var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
return globalSettings.MainDomLock.Equals("SqlMainDomLock") || isWindows == false
? (IMainDomLock)new SqlMainDomLock(builder.BuilderLoggerFactory.CreateLogger<SqlMainDomLock>(), builder.BuilderLoggerFactory, globalSettings, connectionStrings, dbCreator, hostingEnvironment)
@@ -328,14 +324,14 @@ namespace Umbraco.Extensions
return webProfiler;
}
private static ITypeFinder CreateTypeFinder(ILoggerFactory loggerFactory, IWebHostEnvironment webHostEnvironment, Assembly entryAssembly, IConfiguration config)
internal static ITypeFinder CreateTypeFinder(ILoggerFactory loggerFactory, IWebHostEnvironment webHostEnvironment, Assembly entryAssembly, IConfiguration config)
{
var profiler = GetWebProfiler(config);
var typeFinderSettings = config.GetSection(Core.Constants.Configuration.ConfigTypeFinder).Get<TypeFinderSettings>() ?? new TypeFinderSettings();
var runtimeHashPaths = new RuntimeHashPaths().AddFolder(new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, "bin")));
var runtimeHash = new RuntimeHash(new ProfilingLogger(loggerFactory.CreateLogger("RuntimeHash"), profiler), runtimeHashPaths);
var runtimeHash = new RuntimeHash(new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), profiler), runtimeHashPaths);
return new TypeFinder(
loggerFactory.CreateLogger<TypeFinder>(),
@@ -345,20 +341,22 @@ namespace Umbraco.Extensions
);
}
private static TypeLoader CreateTypeLoader(
ITypeFinder typeFinder,
internal static TypeLoader CreateTypeLoader(
Assembly entryAssembly,
IWebHostEnvironment webHostEnvironment,
ILoggerFactory loggerFactory,
IProfilingLogger profilingLogger,
IAppPolicyCache runtimeCache,
AppCaches appCaches,
IConfiguration configuration)
{
var typeFinder = CreateTypeFinder(loggerFactory, webHostEnvironment, entryAssembly, configuration);
var hostingSettings = configuration.GetSection(Core.Constants.Configuration.ConfigHosting).Get<HostingSettings>() ?? new HostingSettings();
var hostingEnvironment = new AspNetCoreHostingEnvironmentWithoutOptionsMonitor(hostingSettings, webHostEnvironment);
var profilingLogger = new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), GetWebProfiler(configuration));
return new TypeLoader(
typeFinder,
runtimeCache,
appCaches.RuntimeCache,
new DirectoryInfo(hostingEnvironment.LocalTempPath),
loggerFactory.CreateLogger<TypeLoader>(),
profilingLogger