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

NetCore: MSDI refactor phase 2 (#9280)

Browse Source 
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
This commit is contained in:
Paul Johnson
2020-10-27 10:53:01 +00:00
committed by GitHub
parent 507facbdaa
commit ec66990e72
111 changed files with 662 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Composing/ModuleInjector.cs
View File

@@ -20,7 +20,7 @@ namespace Umbraco.Web.Composing
try
{
// using the service locator here - no other way, really
Module = Current.Factory.GetInstance<TModule>();
Module = Current.Factory.GetRequiredService<TModule>();
}
catch
{
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Composing
try
{
runtimeState = Current.Factory.GetInstance<IRuntimeState>();
runtimeState = Current.Factory.GetRequiredService<IRuntimeState>();
}
catch { /* don't make it worse */ }