Commit Graph

157 Commits

Author SHA1 Message Date
Mole
b74abaf3af Align namespaces in DependencyInjection to Umbraco.Cms.Infrastructure.DependencyInjection
Even though Core also has this, then pretty much every project has their own DI namespace, and this one does reference third party dependencies as far as I can see
2021-02-12 10:41:07 +01:00
Mole
d621174f31 Align namespaces in Umbraco.Tests.Integration 2021-02-11 08:30:27 +01:00
Mole
476d60cc50 Align namespaces in Umbraco.Tests.Common 2021-02-10 14:45:44 +01:00
Mole
55aa2edb72 Align namespaces in Umbraco.Web.Common 2021-02-10 11:42:04 +01:00
Mole
428e80f515 Align namespaces in Umbraco.Web.BackOffice 2021-02-10 11:11:18 +01:00
Mole
216fb87c79 Rename Umbraco.Core namespace to Umbraco.Cms.Core 2021-02-09 10:22:42 +01:00
Bjarke Berg
d573928cc1 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
2021-01-20 15:53:19 +01:00
Paul Johnson
f1aa22e9e3 test duration on CI pipeline with more databases 2021-01-20 07:41:59 +01:00
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
2021-01-18 16:06:23 +01:00
Bjarke Berg
6310ca31e3 Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-integration-tests
# Conflicts:
#	src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
2021-01-18 07:34:59 +01:00
Shannon
999c20a755 Fixes UmbracoIntegrationTest Mapping flag and missing using in Startup 2021-01-04 12:22:03 +11:00
Andy Butland
410c1751f2 Minor additional code tidy. 2020-12-24 08:55:21 +01:00
Andy Butland
cd5f5778ee Applied linting rules to tests within the Umbraco.Tests.Integration project. 2020-12-24 08:39:18 +01:00
Shannon
1a0d961e42 removes WebsiteComposer, BackOfficeComposer 2020-12-24 18:11:16 +11:00
Shannon
91486bbede Removes IServerRegistrar, new IServerRoleAccessor, removes more composers, moves more to ext, 2020-12-24 16:35:59 +11:00
Shannon
307ef4c1e0 Removes IBatchedDatabaseServerMessenger, renames methods of IServerMessenger 2020-12-24 14:44:42 +11:00
Shannon
b20ce5a92e A bunch of cleanup for DI namespaces, ext methods and dist cache classes 2020-12-24 09:50:05 +11:00
Shannon
a70951b382 Fixes (hopefully last) tests 2020-12-23 14:28:03 +11:00
Shannon
534b74dda5 Changes CustomTestSetup to just be a normal method, not sure why it was an action, fixes ContentEventsTests which requires NuCache 2020-12-23 13:57:41 +11:00
Shannon
7115e0a11e shuffles code with DependencyInjection namespace, forgot to commit changes to Startup 2020-12-23 12:02:01 +11:00
Shannon
ac7fac8f56 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/9779-publishedsnapshot-slight-cleanup 2020-12-23 11:12:55 +11:00
Paul Johnson
50c15a42ed Misc, async TearDown 2020-12-22 10:43:07 +00:00
Shannon
f5e9441e9f renames umb builder ext class to be more explicit, no more AddAllBackOfficeComponents, just AddBackOffice, removes NuCacheComposer 2020-12-22 12:16:37 +11:00
Paul Johnson
198586a82b Dispose host on test teardown. 2020-12-21 09:02:05 +00:00
Shannon
03f22e9362 Fixing tests after merge 2020-12-21 16:44:50 +11:00
Paul Johnson
e4e26159ae Prevent multiple first time schema create 2020-12-18 14:10:11 +00:00
Paul Johnson
6114fffb4a Remove HostBuilder UseUmbraco extension, it's not required. 2020-12-18 09:53:01 +00:00
Paul Johnson
a883df9d88 Use HostBuilder.UseUmbraco in same order for tests and running web app 2020-12-17 12:44:09 +00:00
Paul Johnson
79aa2e1cc2 LocalDb TestDatabase cleanup
LocalDbTestDatabase now renames the final database like it used to (guid vs sensible name)
Made serilog log to integration tests TEMP as far as I can tell it wasn't writing at all before
2020-12-17 11:19:47 +00:00
Paul Johnson
431403e372 Fixup CoreRuntime so it starts after Startup.Configure
Makes integration tests play nice with Components as RuntimeLevel will be correct
2020-12-17 11:19:47 +00:00
Paul Johnson
a69739a7a2 Remove CoreInitialComponent 2020-12-17 11:17:46 +00:00
Paul Johnson
4dbe5d0c38 Consolidate LocalDbTestDatabase and SqlDeveloperTestDatabase
Resolve issue with multiple empties
2020-12-12 11:33:57 +00:00
Paul Johnson
312ab96277 Resolve issues with AdvancedMigrationTests 2020-12-11 19:04:39 +00:00
Paul Johnson
897fe804b0 Multiple test databases, similar setup to LocalDbTestDatabase.DatabasePool 2020-12-11 14:12:34 +00:00
Paul Johnson
51f20119a2 Enable running integrations tests on Linux 2020-12-11 14:12:34 +00:00
James Jackson-South
826e5a9bad Update to match new rules. And fix dup usings 2020-12-03 13:32:04 +00:00
James Jackson-South
0369375d8e Merge branch 'netcore/netcore' into netcore/feature/9397 2020-12-01 12:44:10 +00:00
James Jackson-South
748cbb1f7b Normalize builder namespace 2020-12-01 12:42:14 +00:00
Shannon
e0665973e3 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6666-auth-policies
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
2020-11-25 11:55:16 +11:00
Paul Johnson
5268f9d7f0 Resolve review comments 2020-11-24 09:37:52 +00:00
Paul Johnson
a62079d794 Use OptionsMonitorAdapter over AspNetCoreHostingEnvironmentWithoutOptionsMonitor
Rollback Serilog setup as I broke BASEDIR env var
2020-11-23 10:27:13 +00:00
Paul Johnson
0241649f7f Cleanup AddUmbraco & AddUmbracoCore 2020-11-21 15:22:24 +00:00
Paul Johnson
39657dea6d UmbracoBuilder now requires TypeLoader via ctor 2020-11-20 12:18:25 +00:00
Paul Johnson
5b1ccb0659 Remove the crazy Func param on AddUmbracoCore 2020-11-20 11:13:53 +00:00
Paul Johnson
daf972fc62 Closer to removing all BuildServiceProvider calls 2020-11-19 22:02:19 +00:00
Paul Johnson
8b97ce69b1 Removed CoreRuntimeBootstrapper
Establish runtime level at run time not during service registration.
2020-11-19 20:21:45 +00:00
Paul Johnson
3672a9f2f2 Add composers via extension on UmbracoBuilder
reduce scope of CoreRuntimeBootstrapper
2020-11-19 16:20:39 +00:00
Paul Johnson
48b61ec4c4 Simplify UmbracoBuilder setup 2020-11-19 09:12:39 +00:00
Paul Johnson
aec25d5007 Replace Composition with UmbracoBuilder 2020-11-18 17:41:57 +00:00
Shannon
99247d7fbe Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
2020-11-18 16:02:51 +11:00