Bjarke Berg
|
dc643ab6a6
|
Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten
# Conflicts:
# src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
# src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
# src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
# src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
# src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
# src/Umbraco.Web.BackOffice/Controllers/RedirectUrlManagementController.cs
|
2020-09-10 14:01:38 +02:00 |
|
Nikolaj
|
6cd8617202
|
Fix tests
|
2020-09-08 15:17:57 +02:00 |
|
Andy Butland
|
1d124ea0ac
|
Merge branch 'netcore/netcore' into feature/8651-config-options-patten
# Conflicts:
# src/Umbraco.Tests.Integration/Persistence/Repositories/DictionaryRepositoryTest.cs
# src/Umbraco.Tests.Integration/Persistence/Repositories/LanguageRepositoryTest.cs
# src/Umbraco.Tests.Integration/Persistence/Repositories/TemplateRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Services/ContentServiceTests.cs
# src/Umbraco.Tests/Services/UserServiceTests.cs
|
2020-08-27 18:58:12 +02:00 |
|
Elitsa Marinovska
|
4edf002dd0
|
Migrating old tests to .net core test projects
|
2020-08-18 16:10:05 +02:00 |
|