Commit Graph

36303 Commits

Author SHA1 Message Date
Paul Johnson
7abf9466c0 Merge branch 'netcore/netcore' into netcore/feature/msdi-remove-composition 2020-11-23 12:29:00 +00:00
Paul Johnson
8ca3f602e2 Further cleanup of AddUmbracoCore
IUmbracoBootPermissionChecker is irrelevant in .net core as there's no concept of full trust
Allow container to create DbProviderFactoryCreator with a factory method.
2020-11-23 12:22:34 +00:00
Bjarke Berg
ebe643e30b Merge pull request #9412 from AndyButland/feature/membership-helper-facade
NetCore: Creates abstraction for membership helper and migrates controllers now dependent on it.
2020-11-23 13:15:26 +01: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
Bjarke Berg
94f73ef5d9 Merge pull request #9421 from umbraco/netcore/feature/property-editors-migration-from-infrastructure
Netcore: Migration of Property Editor classes from Umbraco.Infrastructure to Core
2020-11-23 10:06:43 +01:00
Bjarke Berg
a9eb5c3428 Fix issue found in test. Return IActionResult instead of HttpResponseMessage 2020-11-23 08:11:01 +01:00
Bjarke Berg
d2a57496e5 Fix issue found in test. Return IActionResult instead of HttpResponseMessage 2020-11-23 08:08:52 +01:00
Andy Butland
09cfe5f055 Fixed typo in class name. 2020-11-22 09:51:57 +01:00
Paul Johnson
73bd42a916 Fix parameter name for IUmbracoBuilder 2020-11-21 15:43:01 +00:00
Paul Johnson
0241649f7f Cleanup AddUmbraco & AddUmbracoCore 2020-11-21 15:22:24 +00:00
Paul Johnson
5e2de50382 Fix legacy tests 2020-11-20 12:32:56 +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
4520b2ab21 Fix for failing test RelationRepositoryTests.Get_Paged_Child_Entities_By_Parent_Id 2020-11-20 09:44:49 +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
Elitsa Marinovska
7809d1501e Migrations from PropertyEditors folder without dependencies to DataValueEditor or ConfigurationEditor<TConfiguration> 2020-11-19 15:21:10 +01:00
Elitsa Marinovska
74262e18b5 Migrations from PropertyEditors/ValueConverters without dependencies to DataValueEditor or ConfigurationEditor<TConfiguration> 2020-11-19 15:12:50 +01:00
Elitsa Marinovska
790271382e Placing ConfigurationEditor to its correct (old) place 2020-11-19 15:09:25 +01: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
Andy Butland
024b37e0e6 Added further method header comment. 2020-11-18 17:41:10 +01:00
Andy Butland
c971a2d23d Introduced website security accessor to ensure members aren't shared between sessions. 2020-11-18 17:37:31 +01:00
Steve Temple
945d9b9a8e Merge pull request #9411 from simonech/netcore/feature/linux-solution-file
Added netcore-only solution file
2020-11-18 16:14:46 +00:00
Andy Butland
d8ef341854 Refactored to async where appropriate.
Added call to new abstraction in member authorize attribute.
2020-11-18 16:52:40 +01:00
Simone Chiaretta
3303df4918 Added netcore-only solution file 2020-11-18 16:46:59 +01:00
Andy Butland
0fbe01cd22 Created new abstraction IUmbracoWebsiteSecurity and migrated controller's using it (replacing MembershipHelper) to Umbraco.Web.Website. 2020-11-18 16:12:42 +01:00
Paul Johnson
85c706087c Add collection builder support to UmbracoBuilder 2020-11-18 10:41:20 +00:00
Shannon Deminick
64609475d3 Merge pull request #9248 from umbraco/netcore/task/6973-migrating-authenticationcontroller
Migrate remaining bits AuthenticationController and BackOfficeController OAuth methods
2020-11-18 16:03:21 +11: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
Shannon Deminick
7e36bf55b5 Merge pull request #9257 from umbraco/netcore/task/6973-migrating-authenticationcontroller-merge
Merges netcore/dev (from merge_umbraco_id_into_netcore_dev) into the 6973-migrating-authenticationcontroller branch
2020-11-18 15:58:35 +11:00
Elitsa Marinovska
dd5f400cf3 Netcore: Migration of Model classes from Umbraco.Infrastructure to Core (#9404)
* Migrating more model, mapping and tree classes

* Migrating files from Mapping dir without Newtonsoft dependency

* Migrating files from PublishedContent and Editors dirs without Newtonsoft dependency + some more of the same kind

* Migrating DataType class without the usage of Newtonsoft.Json and making the corresponding changes to all classes affected

* Combining 3 ContentExtensions files into 1

* Refactoring from migrating ContentExtensions

* Migrating more classes

* Migrating ContentRepositoryExtensions - combining it with existing file in Umbraco.Core

* removing Newtonsoft json dependency & migrating file. Adding partial migration of ConfigurationEditor, so PropertyTagsExtensions can be migrated

* Migrating ContentTagsExtensions, and refactoring from changes in PropertyTagsExtensions

* Changes that should be reverted once ConfigurationEditor class is fully migrated

* VS couldn't find Composing, so build was failing. Removing the using solves the problem

* Handling a single case for deserializing a subset of an input

* Small changes and added tests to JsonNetSerializer

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated ConfigurationEditor

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-11-17 20:27:10 +01:00
Paul Johnson
d498c1a2cd Netcore: Turn container validation back on (#9401)
* Remove RuntimeLevelAttribute & disable filtering

* Remove RuntimeLevelAttribute usage on Composers

* Fix broken tests

* Resolve UserManager registration issues.

* Turn container validation back on.

* Resolve lifetime issue post install backoffice.

* Remove final TODO: MSDI
2020-11-17 08:56:04 +01:00
Bjarke Berg
76aada2aef Merge pull request #9380 from rustybox/feature/netcore/msdi-refactor-use-DefaultControllerActivator
Netcore: Use DefaultControllerActivator
2020-11-16 13:16:31 +01:00
Bjarke Berg
13964d398b Merge remote-tracking branch 'origin/netcore/netcore' into feature/netcore/msdi-refactor-use-DefaultControllerActivator
# Conflicts:
#	src/Umbraco.Web.Website/Extensions/UmbracoWebstiteServiceCollectionExtensions.cs
#	src/Umbraco.Web.Website/Runtime/WebsiteComposer.cs
2020-11-16 10:35:51 +01:00
Elitsa Marinovska
a1f9bc9b17 NetCore: Install page db checks (#9388)
* Making more explicit checks for the db type

* Fixed confusion with both ints and strings

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-11-13 08:50:35 +01:00
Bjarke Berg
e46a248832 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller-merge
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
#	src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web.BackOffice/Runtime/BackOfficeComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/UmbracoContext/UmbracoContext.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
2020-11-12 13:10:19 +01:00
Bjarke Berg
d756248c7c Merge remote-tracking branch 'origin/netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge
# Conflicts:
#	src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Services/MemberServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.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/config/umbracoSettings.config
2020-11-12 12:57:03 +01:00
Bjarke Berg
bb1b04be15 Netcore: Cleanup and migrate few classes from Umbraco.Web (#9375)
* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Migrated a few classes, and cleaned up by removing some old classs too in the Umbraco.Web Project

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved SurfaceControllerTypeCollection + Builder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Moved Extension methods

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Removed Wrap methods.. People should use their own TagBuilder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-12 11:01:19 +01:00
Bjarke Berg
eaf6543f99 post merge 2020-11-12 09:50:55 +01:00
Bjarke Berg
b2bcdb898e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Services/IconService.cs
2020-11-12 09:13:53 +01:00
Paul Johnson
7561bb5244 No need to register controllers into container, DefaultControllerActivator works fine. 2020-11-11 19:15:30 +00:00
Paul Johnson
8775770d76 Remove BuildServiceProvider call from UmbracoWebServiceCollectionExtensions (#9372) 2020-11-10 20:04:29 +01:00
Andy Butland
b4ce2873cc NetCore: Migrated database server registrar and messenger tasks into hosted services (#9353)
* Migrated database server registrar and messenger tasks into hosted services.
Moved DatabaseServerRegistrar Options into injectable configuration.

* Added further cases for unit tests on hosted services checking execution based on runtime level.

* Migrated DatabaseServerMessengerOptions into configuration.
2020-11-10 20:02:09 +01:00
Paul Johnson
3f5f85880e NetCore: MSDI refactor split CoreRuntime & Remove Current (#9356)
* Split Bootstrap code from CoreRuntime

* Make ContentService method signatures match interface
prevents need to hide the concrete class in tests

* Remove Current

Only bit that bugs me is TreeNode for IconFilePath
I get the feeling it's dead code, but can just use a setter in cs or work out path in js if required.

* Fix tests, remember to terminate IRuntime
2020-11-10 09:50:47 +01:00
Bjarke Berg
190ff2ae6d Merge pull request #8747 from AndyButland/feature/avoid-sync-io-exception-on-image-render
Resolves issue with rendering back-office media selections when synchronous IO is not allowed.
2020-11-09 06:35:11 +01:00
Andy Butland
0351a3eed4 Merge branch 'netcore/netcore' into feature/avoid-sync-io-exception-on-image-render
# Conflicts:
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeServiceCollectionExtensions.cs
2020-11-06 15:16:51 +01:00
Bjarke Berg
27fd71225e Merge pull request #9287 from umbraco/netcore/feature/AB9042-migrate-from-infrastructure
Netcore: Migration of classes from Umbraco.Infrastructure
2020-11-05 13:02:49 +01:00
Bjarke Berg
ffd28b1fb8 More enums as string in UI
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-04 19:50:01 +01:00