Bjarke Berg
|
f413f279eb
|
Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
# Conflicts:
# src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
# src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
# src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
# src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
# src/Umbraco.Tests.Integration/RuntimeTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
# src/Umbraco.Tests/Components/ComponentTests.cs
# src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
# src/Umbraco.Tests/Models/VariationTests.cs
# src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
# src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
# src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
# src/Umbraco.Tests/Published/ConvertersTests.cs
# src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
# src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
# src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
# src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
# src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
# src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
# src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
# src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
# src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
|
2020-09-23 07:59:10 +02:00 |
|