Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces

# Conflicts:
#	src/Umbraco.Infrastructure/Migrations/Expressions/Rename/Expressions/RenameColumnExpression.cs
#	src/Umbraco.Infrastructure/Migrations/IMigrationExpression.cs
This commit is contained in:
Mole
2021-02-23 09:06:31 +01:00
26 changed files with 43 additions and 387 deletions

View File

@@ -62,7 +62,7 @@ namespace Umbraco.Tests.TestHelpers
services.AddUnique<ISqlContext>(_ => SqlContext);
var factory = Current.Factory = composition.CreateServiceProvider();
var factory = Current.Factory = TestHelper.CreateServiceProvider(composition);
var pocoMappers = new NPoco.MapperCollection { new PocoMapper() };
var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init());